Updated scripts (/dev, /proc, /sys handling updates).

diff --git a/scripts/c3.sh b/scripts/c3.sh
index 4e79c053db4c028fb77c67fc95504e24a48e267b..5ef378b74d85ee5e8cea3a35ba4b59526ce3da3c 100755 (executable)
--- a/scripts/c3.sh
+++ b/scripts/c3.sh
@@ -60,19 +60,8 @@ copy_and_install()
 
     if [ "$1" = "btrfs" ]
     then
-        for FQ_DIRECTORY in $BASE_CONTAINER_PATH/rootfs/*
-        do
-            DIRECTORY=$(basename $FQ_DIRECTORY)
-            case "$DIRECTORY" in
-                "dev" | "proc")
-                    # already mounted, skip
-                    ;;
-                *)
-                    # each container modifies its own version
-                    cp --archive $FQ_DIRECTORY $CONTAINER_BUILDROOT
-                    ;;
-            esac
-        done
+        # each container modifies its own version
+        cp --archive $BASE_CONTAINER_PATH/rootfs/* $CONTAINER_BUILDROOT
     else
         for FQ_DIRECTORY in $BASE_CONTAINER_PATH/rootfs/*
         do
@@ -82,9 +71,6 @@ copy_and_install()
                     # common for all containers
                     cp --archive --link $FQ_DIRECTORY $CONTAINER_BUILDROOT
                     ;;
-                "dev" | "proc")
-                    # already mounted, skip
-                    ;;
                 *)
                     # each container must have its own version
                     cp --archive $FQ_DIRECTORY $CONTAINER_BUILDROOT

diff --git a/scripts/create-base.sh b/scripts/create-base.sh
index ad4dbdbf2e4e0c89a0d8f0b17a3017cd9acadaee..92ce3044446b2a38d0f7195b587adcdfe7f38c74 100755 (executable)
--- a/scripts/create-base.sh
+++ b/scripts/create-base.sh
@@ -314,6 +314,9 @@ postinstall()
     umount $CONTAINER_BUILDROOT/dev
     umount $CONTAINER_BUILDROOT/proc
     umount $CONTAINER_BUILDROOT/sys
+    rmdir $CONTAINER_BUILDROOT/dev
+    rmdir $CONTAINER_BUILDROOT/proc
+    rmdir $CONTAINER_BUILDROOT/sys
 }
 
 unprivilege()
@@ -340,7 +343,7 @@ unprivilege()
 
     find $CONTAINER_BUILDROOT -uid -100000 | while read PRIV_UID_FILE
     do
-        ls -l $PRIV_UID_FILE
+        ls --directory -l $PRIV_UID_FILE
         PRIV_UID=$(stat --format="%u" $PRIV_UID_FILE)
         UNPRIV_UID=$(( $PRIV_UID + 100000 ))
         chown --no-dereference $UNPRIV_UID $PRIV_UID_FILE
@@ -348,7 +351,7 @@ unprivilege()
 
     find $CONTAINER_BUILDROOT -gid -100000 | while read PRIV_GID_FILE
     do
-        ls -l $PRIV_GID_FILE
+        ls --directory -l $PRIV_GID_FILE
         PRIV_GID=$(stat --format="%g" $PRIV_GID_FILE)
         UNPRIV_GID=$(( $PRIV_GID + 100000 ))
         chgrp --no-dereference $UNPRIV_GID $PRIV_GID_FILE

diff --git a/scripts/update-base.sh b/scripts/update-base.sh
index f9bc5350bf1e47126ffdd6d75ebcd15519d44a35..00e4331f8da834f0278dbb08324c6364a4503d4b 100755 (executable)
--- a/scripts/update-base.sh
+++ b/scripts/update-base.sh
@@ -39,6 +39,9 @@ umount_dev_proc_sys()
     umount $CONTAINER_PATH/rootfs/dev
     umount $CONTAINER_PATH/rootfs/proc
     umount $CONTAINER_PATH/rootfs/sys
+    rmdir $CONTAINER_PATH/rootfs/dev
+    rmdir $CONTAINER_PATH/rootfs/proc
+    rmdir $CONTAINER_PATH/rootfs/sys
 }
 
 unprivilege()