mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update for xbps>=0.17, support new login with pam.

Browse Source
This commit is contained in:
Juan RP 2012-08-29 16:48:08 +02:00
parent 6f65afafa5
commit 0afde3876f
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mklive.sh.in
View File

@ -240,8 +240,8 @@ if [ -n "$REPOSITORY_CACHE" ]; then
fi fi
XBPS_VERSION=$($XBPS_BIN_CMD -V|awk '{print $2}') XBPS_VERSION=$($XBPS_BIN_CMD -V|awk '{print $2}')
case $XBPS_VERSION in case $XBPS_VERSION in
# XBPS >= 0.16.6 # XBPS >= 0.17
[0-9].[1-9][6-9].[6-9]*) XBPS_016_6=1;; [0-9].[1-9][7-9]*) XBPS_017=1;;
esac esac
info_msg "Redirecting stdout/stderr to $LOGFILE ..." info_msg "Redirecting stdout/stderr to $LOGFILE ..."
@ -335,7 +335,7 @@ while [ $# -ne 0 ]; do
cp -f $bpkg $ROOTFS/packages/$arch cp -f $bpkg $ROOTFS/packages/$arch
ln -sfr $ROOTFS/packages/$arch/$binpkg $ROOTFS/packages/$binpkg ln -sfr $ROOTFS/packages/$arch/$binpkg $ROOTFS/packages/$binpkg
done done
if [ -n "$XBPS_016_6" ]; then if [ -n "$XBPS_017" ]; then
$XBPS_REPO_CMD index-add $ROOTFS/packages/*.xbps 2>&1 >>$LOGFILE $XBPS_REPO_CMD index-add $ROOTFS/packages/*.xbps 2>&1 >>$LOGFILE
rm -f $ROOTFS/packages/index-files.plist rm -f $ROOTFS/packages/index-files.plist
else else
@ -343,16 +343,12 @@ else
rm -f $ROOTFS/packages/index-files.plist rm -f $ROOTFS/packages/index-files.plist
fi fi
# install lsblk and blkid from util-linux. to avoid installing # Install some required utilities from util-linux.
# the whole package.
_lsblk=$(which lsblk) _lsblk=$(which lsblk)
_blkid=$(which blkid)
install -Dm755 ${_lsblk} "$ROOTFS/usr/bin/lsblk" || error_out $? install -Dm755 ${_lsblk} "$ROOTFS/usr/bin/lsblk" || error_out $?
install -Dm755 ${_blkid} "$ROOTFS/usr/sbin/blkid" || error_out $?
# install mount from util-linux.
install -Dm755 /bin/mount "$ROOTFS/usr/bin/mount" || error_out $?
# We rely on pam now, so let's install the host login config.
install -Dm644 /etc/pam.d/login "$ROOTFS/etc/pam.d/login" || error_out $?
# #
# The pseudofs aren't needed anymore in target rootfs. # The pseudofs aren't needed anymore in target rootfs.
# #