aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2013-01-18 20:29:29 +0000
committerRob Austein <sra@hactrn.net>2013-01-18 20:29:29 +0000
commita72c2d12081a66117420d530bd6e8b4e2fc7aa90 (patch)
treec7f8171136e5ff90d9643829e4637aaf1ed30774
parent4ef639469607b92edf8460e3df335312d46c4e86 (diff)
Defer device inode creation until package installation.
svn path=/branches/tk377/; revision=4975
-rw-r--r--rcynic/installation-scripts/linux/install.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/rcynic/installation-scripts/linux/install.sh b/rcynic/installation-scripts/linux/install.sh
index 143f8e1a..039c753b 100644
--- a/rcynic/installation-scripts/linux/install.sh
+++ b/rcynic/installation-scripts/linux/install.sh
@@ -84,7 +84,10 @@ fi
echo "Installing device inodes"
-if ! (cd /dev; /bin/ls null zero random urandom | /bin/cpio -puv "${jaildir}/dev")
+if test $running_fakeroot = yes
+then
+ echo "Running under fakeroot, so skipping ${jaildir}/dev device inode setup"
+elif ! (cd /dev; /bin/ls null zero random urandom | /bin/cpio -puv "${jaildir}/dev")
then
echo "Unable to install device inodes in ${jaildir}/dev/, please fix this then try again"
exit 1
@@ -116,7 +119,7 @@ fi
if test $running_fakeroot = yes
then
- echo "Running under fakeroot, so skipping chown calls"
+ echo "Running under fakeroot, so skipping ${jaildir} chown calls"
elif ! /bin/chown -R root:root "${jaildir}/bin" "${jaildir}/etc" ||
! /bin/chown -R "${jailuser}:${jailgroup}" "${jaildir}/data" ||
( test -f "${jaildir}/etc/rsa_key" && ! /bin/chown "${jailuser}" "${jaildir}/etc/rsa_key" )