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

mkrootfs: update for base-system as runit.

Browse Source
This commit is contained in:
Juan RP
2014-07-29 08:33:04 +02:00
parent 6d7fa74d74
commit 194c1cdd89
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mkrootfs.sh.in
View File

@@ -178,14 +178,14 @@ if [ -n "${_ARCH}" ]; then
register_binfmt register_binfmt
run_cmd "xbps-reconfigure -r $rootfs base-directories" run_cmd "xbps-reconfigure -r $rootfs base-directories"
run_cmd "chroot $rootfs xbps-reconfigure shadow" run_cmd "chroot $rootfs xbps-reconfigure shadow"
if [ "$PKGBASE" = "base-system" ]; then if [ "$PKGBASE" = "base-system-systemd" ]; then
run_cmd "chroot $rootfs xbps-reconfigure systemd" run_cmd "chroot $rootfs xbps-reconfigure systemd"
fi fi
run_cmd "chroot $rootfs xbps-reconfigure -a" run_cmd "chroot $rootfs xbps-reconfigure -a"
rmdir $rootfs/usr/lib32 rmdir $rootfs/usr/lib32
rm -f $rootfs/lib32 $rootfs/lib64 $rootfs/usr/lib64 rm -f $rootfs/lib32 $rootfs/lib64 $rootfs/usr/lib64
else else
if [ "$PKGBASE" = "base-system" ]; then if [ "$PKGBASE" = "base-system-systemd" ]; then
run_cmd "chroot $rootfs xbps-reconfigure systemd" run_cmd "chroot $rootfs xbps-reconfigure systemd"
fi fi
fi fi
@@ -205,9 +205,9 @@ rm -rf $rootfs/var/cache/* 2>/dev/null
# Generate final tarball. # Generate final tarball.
# #
arch=$ARCH arch=$ARCH
if [ -n "$TARGET_ARCH" ]; then if [ -n "${_ARCH}" ]; then
rm -f $rootfs/usr/bin/qemu-*-static rm -f $rootfs/usr/bin/$QEMU_BIN
arch=$TARGET_ARCH arch=${_ARCH}
fi fi
tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz