Fixed mounting of .pnd on /

Changed gdm to slim
Updated sudoers
	modified:   testdata/scripts/pnd_run.sh
	modified:   testdata/sh/sudoers

diff --git a/testdata/scripts/pnd_run.sh b/testdata/scripts/pnd_run.sh
index 51546f6..24cd9b2 100755 (executable)
--- 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/gdm stop
+               sudo /etc/init.d/slim stop
                sleep 5s
        else
                echo -e “ae[34me[30m”
@@ -78,8 +78,8 @@ if [ $nox ]; then #the app doesnt want x to run, so we kill it and restart it on
                if [ $? = 102 ]; then
                exit 1
                fi
-               # close x now, do we want to use gdm stop or just kill x?
-               sudo /etc/init.d/gdm stop
+               # close x now, do we want to use slim stop or just kill x?
+               sudo /etc/init.d/slim stop
                sleep 5s
        fi
 fi
@@ -87,7 +87,8 @@ fi
 #vars
 DFS=$(file -b $PND | awk '{ print $1 }') #is -p a zip/iso or folder?
 MOUNTPOINT=$(df $PND | sed -ne 's/.*\% \(\S*\)/\1/p' | tail -n1) #find out on which mountpoint the pnd is
-FILESYSTEM=$(mount | grep "on $MOUNTPOINT " | awk '{print $5}') #get filesystem appdata is on to determine aufs options
+if [ ! -d "$MOUNTPOINT" ]; then MOUNTPOINT="/"; fi #make sure folder exists, if it doesnt assume rootfs
+FILESYSTEM=$(mount | grep "on $MOUNTPOINT " | grep -v rootfs | awk '{print $5}' | tail -n1) #get filesystem appdata is on to determine aufs options
 echo "Filesystem is $FILESYSTEM"
 #if the pnd is on / set mountpoint to "" so we dont and up with // at the start,
 #this is to make sure sudo doesnt get confused
@@ -119,36 +120,36 @@ if [ ! $umount ]; then
        mount | grep "on /mnt/utmp/$BASENAME type" # > /dev/null
        if [ ! $? -eq 0 ]; then 
 
-       FREELOOP=$(sudo /sbin/losetup -f) #get first free loop device
-       if [ ! $FREELOOP  ]; then  # no free loop device, create a new one
-               #find a free loop device and use it 
-               usedminor=$(sudo /sbin/losetup -a | tail -n1)
-               usedminor=${usedminor:9:1}
-               echo usedminor $usedminor
-               freeminor=$(($usedminor+1))
-               echo freeminor $freeminor
-               sudo mknod -m777 /dev/loop$freeminor b 7 $freeminor
-               FREELOOP=/dev/loop$freeminor
-       fi
-       
-       #detect fs
-       if [ $DFS = ISO ]; then
-               sudo /sbin/losetup $FREELOOP $PND #attach the pnd to the loop device
-               mntline="sudo mount $FREELOOP /mnt/pnd/$BASENAME/" #setup the mountline for later
-       #       mntline="sudo mount -o loop,mode=777 $PND /mnt/pnd/$BASENAME"
-               echo "Filetype is $DFS"
-       elif [ $DFS = directory ]; then
-               mntline="sudo mount --bind -o ro $PND /mnt/pnd/$BASENAME"
-       #we bind the folder, now it can be treated in a unified way ATENTION: -o ro doesnt work for --bind at least on 25, on 26 its possible using remount, may have changed on 27
-               echo "Filetype is $DFS"
-       elif [ $DFS = Squashfs ]; then
-               sudo /sbin/losetup $FREELOOP $PND #attach the pnd to the loop device
-               mntline="sudo mount -t squashfs  $FREELOOP /mnt/pnd/$BASENAME"
-               echo "Filetype is $DFS"
-       else
-               echo "error determining fs, output was $DFS"
-               exit 1;
-       fi
+         FREELOOP=$(sudo /sbin/losetup -f) #get first free loop device
+         if [ ! $FREELOOP  ]; then  # no free loop device, create a new one
+                 #find a free loop device and use it 
+                 usedminor=$(sudo /sbin/losetup -a | tail -n1)
+                 usedminor=${usedminor:9:1}
+                 echo usedminor $usedminor
+                 freeminor=$(($usedminor+1))
+                 echo freeminor $freeminor
+                 sudo mknod -m777 /dev/loop$freeminor b 7 $freeminor
+                 FREELOOP=/dev/loop$freeminor
+         fi
+         
+         #detect fs
+         if [ $DFS = ISO ]; then
+                 sudo /sbin/losetup $FREELOOP $PND #attach the pnd to the loop device
+                 mntline="sudo mount $FREELOOP /mnt/pnd/$BASENAME/" #setup the mountline for later
+         #     mntline="sudo mount -o loop,mode=777 $PND /mnt/pnd/$BASENAME"
+                 echo "Filetype is $DFS"
+         elif [ $DFS = directory ]; then
+                 mntline="sudo mount --bind -o ro $PND /mnt/pnd/$BASENAME"
+         #we bind the folder, now it can be treated in a unified way ATENTION: -o ro doesnt work for --bind at least on 25, on 26 its possible using remount, may have changed on 27
+                 echo "Filetype is $DFS"
+         elif [ $DFS = Squashfs ]; then
+                 sudo /sbin/losetup $FREELOOP $PND #attach the pnd to the loop device
+                 mntline="sudo mount -t squashfs  $FREELOOP /mnt/pnd/$BASENAME"
+                 echo "Filetype is $DFS"
+         else
+                 echo "error determining fs, output was $DFS"
+                 exit 1;
+         fi
 
 
                echo "$mntline"
@@ -207,5 +208,5 @@ fi
 if [ $nox ]; then #restart x if it was killed
 echo "starting x in 5s"
 sleep 5
-sudo /etc/init.d/gdm start
+sudo /etc/init.d/slim start
 fi

diff --git a/testdata/sh/sudoers b/testdata/sh/sudoers
index 7dd75e3..5bdaf0f 100644 (file)
--- a/testdata/sh/sudoers
+++ b/testdata/sh/sudoers
@@ -1,9 +1,11 @@
-ALL ALL=NOPASSWD: /etc/init.d/gdm stop, /etc/init.d/gdm start, NOEXEC: /bin/mount /dev/loop* /mnt/pnd/* , \ 
+ALL ALL=NOPASSWD: /etc/init.d/slim stop, /etc/init.d/slim 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 --bind -o ro * /mnt/pnd/*, \
+/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/*,\
 /bin/umount /mnt/pnd/*, /bin/umount /mnt/utmp/*, \
 /bin/mkdir -p /mnt/pnd/* , /bin/mkdir -p /mnt/utmp/* , /bin/mkdir -p */pandora/appdata/* , \
 /bin/chmod -R a+xrw */pandora/appdata/*, \
 /bin/rmdir /mnt/pnd/*,/bin/rmdir /mnt/utmp/* ,/bin/rmdir */pandora/appdata/*/.wh..wh.plnk, \
 /bin/rmdir */pandora/appdata/*/.wh..wh..tmp,/bin/rmdir -p */pandora/appdata/*/, \
-/sbin/losetup /dev/loop*, /bin/mknod -m777 /dev/loop*, /sbin/losetup -d /dev/loop*, /bin/rm /dev/loop*
+/sbin/losetup /dev/loop*, /sbin/losetup -d /dev/loop*, /sbin/losetup -f, /sbin/losetup -a, \
+/bin/mknod -m777 /dev/loop* b 7 *, /bin/rm /dev/loop*