oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

setup.sh: clean up

Browse Source 
- Fix unmounting order of slices.
 - Update pkgin pre-installation commands, make them as generic as
   possible.

Change-Id: Ifaa4021fed048facca8d2a170aa65491feb37702
This commit is contained in:
Lionel Sambuc 2016-01-20 17:41:58 +01:00
parent 6c380635c9
commit 39508cdda5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
minix/commands/setup/setup.sh
View File

@ -464,8 +464,8 @@ then
rm -rf /mnt/usr/tmp/root_backup rm -rf /mnt/usr/tmp/root_backup
# umount shouldn't fail here, but if it will, next # umount shouldn't fail here, but if it will, next
# "rm -rf" will serve for user's pleasure. # "rm -rf" will serve for user's pleasure.
umount /mnt/root >/dev/null || exit
umount /mnt/usr >/dev/null || exit umount /mnt/usr >/dev/null || exit
umount /mnt/root >/dev/null || exit
rm -rf /mnt/root /mnt/usr rm -rf /mnt/root /mnt/usr
exit 1 exit 1
fi fi
@ -769,8 +769,8 @@ if [ -e "$PACKAGES_DIR" ]
then then
echo "Installing pkgin..." echo "Installing pkgin..."
sh -c "cp $PACKAGES_DIR/pkgin-* $PACKAGES_DIR/pkg_install-* $PACKAGES_DIR/openssl-* /mnt/tmp && sh -c "cp $PACKAGES_DIR/pkgin-* $PACKAGES_DIR/pkg_install-* $PACKAGES_DIR/libarchive-* /mnt/tmp &&
chroot /mnt pkg_add /tmp/openssl-* /tmp/pkg_install-* /tmp/pkgin-*" chroot /mnt pkg_add /tmp/pkgin-*"
rm -f /mnt/tmp/* rm -f /mnt/tmp/*
if [ -f "$PACKAGES_DIR/pkg_summary.bz2" ] if [ -f "$PACKAGES_DIR/pkg_summary.bz2" ]
@ -786,11 +786,11 @@ then
fi fi
fi fi
umount /dev/$usr && echo Unmounted $usr
umount /dev/$root && echo Unmounted $root
if [ "$nohome" = 0 ]; then if [ "$nohome" = 0 ]; then
umount /dev/$home && echo Unmounted $home umount /dev/$home && echo Unmounted $home
fi fi
umount /dev/$usr && echo Unmounted $usr
umount /dev/$root && echo Unmounted $root
echo " echo "
Please type 'shutdown -r now' to exit MINIX 3 and reboot. To boot into Please type 'shutdown -r now' to exit MINIX 3 and reboot. To boot into