From cc6c89910aff65a23746de75952d98558ee8350b Mon Sep 17 00:00:00 2001 From: vimacs Date: Thu, 17 Dec 2009 03:34:18 +0100 Subject: [PATCH] slim > slim-init modified: testdata/scripts/pnd_run.sh modified: testdata/sh/sudoers --- testdata/scripts/pnd_run.sh | 6 +++--- testdata/sh/sudoers | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh index 24cd9b2..7a96707 100755 --- a/testdata/scripts/pnd_run.sh +++ b/testdata/scripts/pnd_run.sh @@ -70,7 +70,7 @@ if [ $nox ]; then #the app doesnt want x to run, so we kill it and restart it on if [ $? = 102 ]; then exit 1 fi - sudo /etc/init.d/slim stop + sudo /etc/init.d/slim-init stop sleep 5s else echo -e “ae[34me[30m” @@ -79,7 +79,7 @@ if [ $nox ]; then #the app doesnt want x to run, so we kill it and restart it on exit 1 fi # close x now, do we want to use slim stop or just kill x? - sudo /etc/init.d/slim stop + sudo /etc/init.d/slim-init stop sleep 5s fi fi @@ -208,5 +208,5 @@ fi if [ $nox ]; then #restart x if it was killed echo "starting x in 5s" sleep 5 -sudo /etc/init.d/slim start +sudo /etc/init.d/slim-init-init start fi diff --git a/testdata/sh/sudoers b/testdata/sh/sudoers index 5bdaf0f..3084f90 100644 --- a/testdata/sh/sudoers +++ b/testdata/sh/sudoers @@ -1,4 +1,4 @@ -ALL ALL=NOPASSWD: /etc/init.d/slim stop, /etc/init.d/slim start, NOEXEC: /bin/mount /dev/loop* /mnt/pnd/* , \ +ALL ALL=NOPASSWD: /etc/init.d/slim-init stop, /etc/init.d/slim-init start, NOEXEC: /bin/mount /dev/loop* /mnt/pnd/* , \ /bin/mount -t aufs -o exec\,dirs\=*/pandora/appdata/*\=rw+nolwh\:/mnt/pnd/*\=rr none /mnt/utmp/* , \ /bin/mount -t aufs -o exec\,noplink\,dirs\=*/pandora/appdata/*\=rw+nolwh\:/mnt/pnd/*\=rr none /mnt/utmp/* , \ /bin/mount --bind -o ro * /mnt/pnd/*, mount -t squashfs * /mnt/pnd/*,\ -- 2.39.5