morpheus

commit ad2f5337ae4483e542808c5f0658998e7236d269
parent 0b6fc88b206d6dac820f5d4b6840caae629defdc
Author: Hiltjo Posthuma <hiltjo@codemadness.org>
Date:   Sat,  5 Jul 2014 21:29:38 +0000

improve setup alpine and crux script

Signed-off-by: Hiltjo Posthuma <hiltjo@codemadness.org>

Diffstat:
M
misc/setup-alpine
 | 
2
+-
M
misc/setup-crux
 | 
15
++++++++-------

2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/misc/setup-alpine b/misc/setup-alpine
@@ -35,7 +35,7 @@ fi
 # copy etc/resolv.conf
 mkdir -p "${installdir}/etc"
 cp /etc/resolv.conf "${installdir}/etc/resolv.conf"
-chmod 755 "${installdir}/etc/resolv.conf"
+chmod 644 "${installdir}/etc/resolv.conf"
 
 # write used mirror as apk repository.
 mkdir -p "${installdir}/etc/apk"
diff --git a/misc/setup-crux b/misc/setup-crux
@@ -16,7 +16,7 @@ set -e -x
 
 iso="crux-3.0.iso"
 mnt="/mnt/crux"
-installdir="/home/hiltjo/cruxtest"
+installdir="/ns/crux"
 
 # mount
 dev=$(losetup -f)
@@ -33,17 +33,18 @@ tar -xJf "${mnt}/rootfs.tar.xz"
 #mkdir -p "${installdir}/pkg/"
 #cp -a "${mnt}/crux/core" "${installdir}/pkg/"
 
-# unmount
-cd /
-umount "${mnt}"
-losetup -d "${dev}"
-
 # make package dir needed by crux.
 mkdir -p "${installdir}/var/lib/pkg"
 touch "${installdir}/var/lib/pkg/db"
 
 # copy etc/resolv.conf
+mkdir -p "${installdir}/etc"
 cp /etc/resolv.conf "${installdir}/etc/resolv.conf"
-chmod 755 "${installdir}/etc/resolv.conf"
+chmod 644 "${installdir}/etc/resolv.conf"
+
+# unmount
+cd /
+umount "${mnt}"
+losetup -d "${dev}" || true
 
 # rmdir "${mnt}"