diff options
| author | Juan RP <xtraeme@gmail.com> | 2014-07-29 08:33:04 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2014-07-29 08:33:04 +0200 |
| commit | 194c1cdd8956aa4ae23282b62ed6bd6a23e44d57 (patch) | |
| tree | 2659fbc76a3e5e8211ff4efcfa33e1fd0422518c /mkrootfs.sh.in | |
| parent | 6d7fa74d7495702ce14e5fb1e9d5ea89d500642f (diff) | |
| download | hrmpf-194c1cdd8956aa4ae23282b62ed6bd6a23e44d57.tar.gz hrmpf-194c1cdd8956aa4ae23282b62ed6bd6a23e44d57.tar.xz hrmpf-194c1cdd8956aa4ae23282b62ed6bd6a23e44d57.zip | |
mkrootfs: update for base-system as runit.
Diffstat (limited to 'mkrootfs.sh.in')
| -rw-r--r-- | mkrootfs.sh.in | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in index 74deae8..acfb58f 100644 --- a/mkrootfs.sh.in +++ b/mkrootfs.sh.in @@ -178,14 +178,14 @@ if [ -n "${_ARCH}" ]; then register_binfmt run_cmd "xbps-reconfigure -r $rootfs base-directories" 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" fi run_cmd "chroot $rootfs xbps-reconfigure -a" rmdir $rootfs/usr/lib32 rm -f $rootfs/lib32 $rootfs/lib64 $rootfs/usr/lib64 else - if [ "$PKGBASE" = "base-system" ]; then + if [ "$PKGBASE" = "base-system-systemd" ]; then run_cmd "chroot $rootfs xbps-reconfigure systemd" fi fi @@ -205,9 +205,9 @@ rm -rf $rootfs/var/cache/* 2>/dev/null # Generate final tarball. # arch=$ARCH -if [ -n "$TARGET_ARCH" ]; then - rm -f $rootfs/usr/bin/qemu-*-static - arch=$TARGET_ARCH +if [ -n "${_ARCH}" ]; then + rm -f $rootfs/usr/bin/$QEMU_BIN + arch=${_ARCH} fi tarball=void-${PLATFORM}-rootfs-$(date '+%Y%m%d').tar.xz |