From 5c2703ae367d3523cb22054f1e1dd82287858b64 Mon Sep 17 00:00:00 2001 From: NIWA Hideyuki Date: Mon, 28 Mar 2016 09:50:47 +0900 Subject: [PATCH] Deploy was changed into update-deploy. --- src/Makefile | 4 ++-- src/doc/help.txt | 8 ++++---- src/doc/slot-os.help.txt | 12 ++++++------ src/driver/docker/fulcon-sysgen | 37 ++++++++++++++++++++++++++++++++++- src/slot-os/update | 2 +- src/slot-os/{deploy => update-deploy} | 12 ++++++------ src/subcmd/{deploy => update-deploy} | 2 +- 7 files changed, 56 insertions(+), 21 deletions(-) rename src/slot-os/{deploy => update-deploy} (76%) rename src/subcmd/{deploy => update-deploy} (93%) diff --git a/src/Makefile b/src/Makefile index 5443b2d..6327268 100644 --- a/src/Makefile +++ b/src/Makefile @@ -59,7 +59,7 @@ install-subcmd : install -m 755 subcmd/set-default-image $(DESTDIR)$(libdir)/fulcon/sbin/set-default-image install -m 755 subcmd/update-prog $(DESTDIR)$(libdir)/fulcon/sbin/update-prog install -m 755 subcmd/update $(DESTDIR)$(libdir)/fulcon/sbin/update - install -m 755 subcmd/deploy $(DESTDIR)$(libdir)/fulcon/sbin/deploy + install -m 755 subcmd/update-deploy $(DESTDIR)$(libdir)/fulcon/sbin/update-deploy install -m 755 subcmd/console $(DESTDIR)$(libdir)/fulcon/sbin/console install -m 755 subcmd/autostart $(DESTDIR)$(libdir)/fulcon/sbin/autostart install -m 755 subcmd/status $(DESTDIR)$(libdir)/fulcon/sbin/status @@ -107,7 +107,7 @@ install-slot-os: install -m 755 slot-os/resume $(DESTDIR)$(libdir)/slot-os/sbin/resume install -m 755 slot-os/update-prog $(DESTDIR)$(libdir)/slot-os/sbin/update-prog install -m 755 slot-os/update $(DESTDIR)$(libdir)/slot-os/sbin/update - install -m 755 slot-os/deploy $(DESTDIR)$(libdir)/slot-os/sbin/deploy + install -m 755 slot-os/update-deploy $(DESTDIR)$(libdir)/slot-os/sbin/update-deploy install -m 755 slot-os/net-add $(DESTDIR)$(libdir)/slot-os/sbin/net-add install -m 755 slot-os/net-del $(DESTDIR)$(libdir)/slot-os/sbin/net-del install -m 755 slot-os/net-info $(DESTDIR)$(libdir)/slot-os/sbin/net-info diff --git a/src/doc/help.txt b/src/doc/help.txt index 27efcbb..511cc8f 100644 --- a/src/doc/help.txt +++ b/src/doc/help.txt @@ -178,14 +178,14 @@ sysgen -n REPEAT_NUMBER [ -c IMAGE ] NAME the name that NAME and the figure combined. ex) "AB" and 3 : AB0001, AB0002, AB0003 -update NAME +update ( all | NAME ...) containers are renewed. "Yum update" is done in centos. In ubuntu, "Apt-get update" and "Apt-get upgrade" are done. update-prog -c NAME COMMAND - A program for update is executed in NAME. + A COMMAND program for update is executed in NAME. -deploy [ -c IMAGE ] SRC_FILE DEST_PATH - A file is copied in NAME. +update-deploy [ -c IMAGE ] SRC_FILE DEST_PATH + A SRC_FILE is copied at then DEST_PATH in the NAME container. diff --git a/src/doc/slot-os.help.txt b/src/doc/slot-os.help.txt index 68b4003..01de366 100644 --- a/src/doc/slot-os.help.txt +++ b/src/doc/slot-os.help.txt @@ -37,9 +37,6 @@ list [ -c ] [ NAME ] -c It always keeps indicating list. When stopping, ^c is pushed. -deploy SRC_FILE DEST_PATH - SRC_FILE on the HOST is copied in DEST_PATH of all slot. - help Help is displayed. @@ -90,14 +87,17 @@ suspend ( all | NUMBER ... ) The NUMBER of the specified NUMBER is suspended. -update +update ( all | NUMBER ...) All slot os packages are updated. "Yum update" is done in centos. In ubuntu, "Apt-get update" and "Apt-get upgrade" are done. -update-prog COMMAND - The command is carried out in all slot. +update-prog ( all | NUMBER ... ) : COMMAND + A COMMAND program for update is executed in NUMBER of slot. + +update-deploy NUMBER ... : SRC_FILE DEST_PATH + SRC_FILE on the HOST is copied in DEST_PATH of NUMBER of slot. diff --git a/src/driver/docker/fulcon-sysgen b/src/driver/docker/fulcon-sysgen index ac37f71..d82805d 100755 --- a/src/driver/docker/fulcon-sysgen +++ b/src/driver/docker/fulcon-sysgen @@ -20,7 +20,42 @@ start_docker() { docker create ${OPTCPUSET}=${CPUSET} ${OPTCPUSHARE} 100 -m 512m \ --name $NAME --hostname $NAME \ -v /sys/fs/cgroup:/sys/fs/cgroup:ro \ - --privileged \ + --cap-drop=ALL \ + --cap-add=AUDIT_CONTROL \ + --cap-add=AUDIT_WRITE \ + --cap-add=CHOWN \ + --cap-add=DAC_OVERRIDE \ + --cap-add=DAC_READ_SEARCH \ + --cap-add=FOWNER \ + --cap-add=FSETID \ + --cap-add=IPC_LOCK \ + --cap-add=IPC_OWNER \ + --cap-add=KILL \ + --cap-add=LEASE \ + --cap-add=LINUX_IMMUTABLE \ + --cap-add=MAC_ADMIN \ + --cap-add=MAC_OVERRIDE \ + --cap-add=MKNOD \ + --cap-add=NET_ADMIN \ + --cap-add=NET_BIND_SERVICE \ + --cap-add=NET_BROADCAST \ + --cap-add=NET_RAW \ + --cap-add=SETFCAP \ + --cap-add=SETGID \ + --cap-add=SETPCAP \ + --cap-add=SETUID \ + --cap-add=SYS_ADMIN \ + --cap-add=SYS_BOOT \ + --cap-add=SYS_CHROOT \ + --cap-add=SYS_MODULE \ + --cap-add=SYS_NICE \ + --cap-add=SYS_PACCT \ + --cap-add=SYS_PTRACE \ + --cap-add=SYS_RAWIO \ + --cap-add=SYS_RESOURCE \ + --cap-add=SYS_TIME \ + --cap-add=SYS_TTY_CONFIG \ + --cap-add=SYSLOG \ -e TERM=vt100 \ $IMAGE /sbin/init RT=$? diff --git a/src/slot-os/update b/src/slot-os/update index ec3f4bb..ce5d234 100755 --- a/src/slot-os/update +++ b/src/slot-os/update @@ -9,7 +9,7 @@ SLOTOSDIR=/var/lib/slot-os usage() { - echo "usage: update ( all | NAME ...) " + echo "usage: update ( all | NUMBER ...) " } lsdir() { diff --git a/src/slot-os/deploy b/src/slot-os/update-deploy similarity index 76% rename from src/slot-os/deploy rename to src/slot-os/update-deploy index 2afbd40..9fe090a 100755 --- a/src/slot-os/deploy +++ b/src/slot-os/update-deploy @@ -9,7 +9,7 @@ SLOTOSDIR=/var/lib/slot-os usage() { - echo "usage: deploy NUMBER ... : SRC_FILE DEST_PATH" + echo "usage: update-deploy NUMBER ... : SRC_FILE DEST_PATH" } lsdir() { @@ -21,7 +21,7 @@ if [ $# -lt 1 ]; then exit -1 fi -if [ x"$1" == x"deploy" ]; then +if [ x"$1" == x"update-deploy" ]; then usage exit -1 fi @@ -41,22 +41,22 @@ if [ `echo $FILES | awk '{print NF}'` -ne 2 ]; then exit -1 fi -SRC=`echo $FILES | cut -d ' ' -f 1 -DIST=`echo $FILES | cut -d ' ' -f 2 +SRC=`echo $FILES | cut -d ' ' -f 1` +DIST=`echo $FILES | cut -d ' ' -f 2` for i in $NUMS do if [ x"$i" == x"all" ]; then for j in `slot-os list | awk '{print $4}'` do - fulcon deploy -c $j $SRC $DIST + fulcon update-deploy -c $j $SRC $DIST done exit 0 fi if [ -f $SLOTOSDIR/slot/$i/fulcon ]; then NAME=`cat $SLOTOSDIR/slot/$i/fulcon` - fulcon deploy -c $j $NAME $DIST + fulcon update-deploy -c $j $NAME $DIST else echo $i is not exist fi diff --git a/src/subcmd/deploy b/src/subcmd/update-deploy similarity index 93% rename from src/subcmd/deploy rename to src/subcmd/update-deploy index 77e2992..fa248d0 100755 --- a/src/subcmd/deploy +++ b/src/subcmd/update-deploy @@ -7,7 +7,7 @@ PATH=/usr/lib/fulcon/driver/$FULCONDRIVER:/usr/lib/fulcon/lib:$PATH usage() { - echo "usage: deploy [ -c NAME ] SRC_FILE DEST_PATH " + echo "usage: update-deploy [ -c NAME ] SRC_FILE DEST_PATH " } # check options -- 2.11.0