Change in work area of make-base-image

diff --git a/src/driver/docker/fulcon-setup2 b/src/driver/docker/fulcon-setup2
index f963f58..1edce99 100755 (executable)
--- a/src/driver/docker/fulcon-setup2
+++ b/src/driver/docker/fulcon-setup2
@@ -9,14 +9,13 @@ SLOTOS=slot-os
 
 usage()
 {
-       cd $DOCKERFILEDIR
        echo "usage: setup2"
 } 
 
 
 setup_slot_image() 
 {
-       pushd  $FULCONDIR/container/$SLOTOS/rootfs >& /dev/null
+       pushd  $FULCONDIR/setup/$SLOTOS/rootfs >& /dev/null
        echo "New OS image is generated from HOST."
        echo "It takes long time for this processing."
        echo "This processing must not interrupt or not turn off power."
@@ -34,6 +33,8 @@ setup_slot_image()
        echo "Generated new image : $SLOTOS"
 }
 
+mkdir -p  $FULCONDIR/setup/$SLOTOS/rootfs 
+
 setup_slot_image
 
 (docker rmi `docker images | grep '<none>' | awk '{printf "%s ",$3}'`) >& /dev/null

diff --git a/src/lib/create-rootfs b/src/lib/create-rootfs
index 98dbfcd..e78d14a 100755 (executable)
--- a/src/lib/create-rootfs
+++ b/src/lib/create-rootfs
@@ -5,7 +5,7 @@
 PATH=/usr/lib/fulcon/lib/:$PATH
 
 # BASE dir
-CONTAINER_DIR=/var/lib/fulcon/container
+CONTAINER_DIR=/var/lib/fulcon/setup
 
 # check root
 if [ ${EUID:-$UID} -ne 0 ] ; then

diff --git a/src/lib/release-rootfs b/src/lib/release-rootfs
index aa72f20..1fc3e33 100755 (executable)
--- a/src/lib/release-rootfs
+++ b/src/lib/release-rootfs
@@ -5,7 +5,7 @@
 PATH=/usr/lib/fulcon/lib/:$PATH
 
 # BASE dir
-CONTAINER_DIR=/var/lib/fulcon/container
+CONTAINER_DIR=/var/lib/fulcon/setup
 
 # check root
 if [ ${EUID:-$UID} -ne 0 ] ; then

diff --git a/src/slot-os/build b/src/slot-os/build
index db95a40..c6369cd 100755 (executable)
--- a/src/slot-os/build
+++ b/src/slot-os/build
@@ -72,6 +72,7 @@ do
                slot-sysgen $SLOTNAME
        else
                echo initialized $SLOTNAME
+               slot-sysgen $SLOTNAME >& /dev/null
        fi
 done