Savefolder without 'mount -o bind' - works
Problem with mechanism to make savefolder names unique
Reporting this here as it affects both TahrPup6.0 and Slacko5.9.3
Scenario:
boot pfix=ram
reboot and create savefolder with extra id
boot pfix=ram again
reboot and create savefolder with the same extra id
get pink warning that savefolder will have -1 appended to make it unique
however during shutdown get short flash of message that the savefolder minus the appended -1 is being used
the savefolder with appended -1 is created but is empty after the reboot
if the empty savefolder is subsequently chosen then chaos breaks out as it is empty
Scenario:
boot pfix=ram
reboot and create savefolder with extra id
boot pfix=ram again
reboot and create savefolder with the same extra id
get pink warning that savefolder will have -1 appended to make it unique
however during shutdown get short flash of message that the savefolder minus the appended -1 is being used
the savefolder with appended -1 is created but is empty after the reboot
if the empty savefolder is subsequently chosen then chaos breaks out as it is empty
LxPup = Puppy + LXDE
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Re: Problem with mechanism to make savefolder names unique
Looks like a shutdownconfig issue.peebee wrote:Reporting this here as it affects both TahrPup6.0 and Slacko5.9.3
Scenario:
boot pfix=ram
reboot and create savefolder with extra id
Do you know if the extra id is needed for the folder to be empty?
ie do you see the same with the default names?
== [url=http://www.catb.org/esr/faqs/smart-questions.html]Here is how to solve your[/url] [url=https://www.chiark.greenend.org.uk/~sgtatham/bugs.html]Linux problems fast[/url] ==
Re: Problem with mechanism to make savefolder names unique
Same problem with default names (no extra id) - tested on Slacko5.9.3 - the savefolder slackosave-1 is created after the pink warning but not written tomavrothal wrote:Looks like a shutdownconfig issue.peebee wrote:Reporting this here as it affects both TahrPup6.0 and Slacko5.9.3
Scenario:
boot pfix=ram
reboot and create savefolder with extra id
Do you know if the extra id is needed for the folder to be empty?
ie do you see the same with the default names?
LxPup = Puppy + LXDE
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Re: Problem with mechanism to make savefolder names unique
A fast check suggests that $PUPSAVE is created before the $SAVEFILE and $NAMEONLY are modified because of the name clash so although these variables have the correct name with the added id the, $PUPSAVE which actually determines where the saving will happen does not.peebee wrote: Same problem with default names (no extra id) - tested on Slacko5.9.3 - the savefolder slackosave-1 is created after the pink warning but not written to
So the data are going into the previous savedirectory.
This is certainly a problem with the modification of shutdownconfig to adopt savedirectory and is not related to the actually method of savedirectory (bind or link).
== [url=http://www.catb.org/esr/faqs/smart-questions.html]Here is how to solve your[/url] [url=https://www.chiark.greenend.org.uk/~sgtatham/bugs.html]Linux problems fast[/url] ==
Re: Problem with mechanism to make savefolder names unique
So here is a fix that works for me.mavrothal wrote: A fast check suggests that $PUPSAVE is created before the $SAVEFILE and $NAMEONLY are modified because of the name clash so although these variables have the correct name with the added id the, $PUPSAVE which actually determines where the saving will happen does not.
So the data are going into the previous savedirectory.
This is certainly a problem with the modification of shutdownconfig to adopt savedirectory and is not related to the actually method of savedirectory (bind or link).
Code: Select all
--- a/usr/sbin/shutdownconfig 2014-11-03 07:03:30.736671557 +0200
+++ a/usr/sbin/shutdownconfig 2014-11-04 06:28:00.323333195 +0200
@@ -874,10 +874,10 @@
echo "PUPMODE=${PUPMODE}
SAVEPART='${SAVEPART}'
SAVEFS='${SAVEFS}'
-PUPSAVE='${PUPSAVE}'
SAVEFILE='${SAVEFILE}'
NAMEONLY='${NAMEONLY}'
SAVEPATH='${SAVEPATH}'
+PUPSAVE='${SAVEPART},${SAVEFS},${SAVEFILE}'
MYPASSWORD='${MYPASSWORD}'
SFEXT='${SFEXT}'
xPDEV='${xPDEV}'
- Attachments
-
- shutdownconfig_fix.pet
- fixes empty save file/folder after name clash
- (13.47 KiB) Downloaded 303 times
== [url=http://www.catb.org/esr/faqs/smart-questions.html]Here is how to solve your[/url] [url=https://www.chiark.greenend.org.uk/~sgtatham/bugs.html]Linux problems fast[/url] ==
Re: Problem with mechanism to make savefolder names unique
Thanks Mav - all AOK in my testsmavrothal wrote:Please test, either by patching or using the attached pet
Cheers
peebee
LxPup = Puppy + LXDE
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Main version used daily: LxPupSc; Assembler of UPups, ScPup & ScPup64, LxPup, LxPupSc & LxPupSc64
Re: Problem with mechanism to make savefolder names unique
Works fine on patched TahrPup 6.0.mavrothal wrote:Please test, either by patching or using the attached pet
I just tried using the default name a second time. It found the duplicate, said it was going to use a modified name, and did.
gyro
I have updated the following:
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'shutdownconfig' as patched by mavrothal,
and version 1.1 of the 'savefile2dir' utility, http://murga-linux.com/puppy/viewtopic.php?t=96472
gyro
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'shutdownconfig' as patched by mavrothal,
and version 1.1 of the 'savefile2dir' utility, http://murga-linux.com/puppy/viewtopic.php?t=96472
gyro
Last edited by gyro on Sun 22 May 2016, 01:56, edited 1 time in total.
Updated packages are now available for:
Slacko 5.7
http://www.fishprogs.software/puppy/slacko/initrd.gz
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
Dpup Squeeze 5.X.3.4.12
http://www.fishprogs.software/puppy/squeeze/initrd.gz
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
Dpup Squeeze 5.X.3.6.2.1
http://www.fishprogs.software/puppy/squeeze36/initrd.gz
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
In each case:
1) Download both files.
2) Rename current 'initrd.gz' as a backup.
3) Move both downloaded files into directory containing the frugal install.
4) Reboot.
Note: As for the 'raring' implementation, the 'squeeze' zdrv acts like a ydrv.
gyro
Slacko 5.7
http://www.fishprogs.software/puppy/slacko/initrd.gz
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
Dpup Squeeze 5.X.3.4.12
http://www.fishprogs.software/puppy/squeeze/initrd.gz
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
Dpup Squeeze 5.X.3.6.2.1
http://www.fishprogs.software/puppy/squeeze36/initrd.gz
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
In each case:
1) Download both files.
2) Rename current 'initrd.gz' as a backup.
3) Move both downloaded files into directory containing the frugal install.
4) Reboot.
Note: As for the 'raring' implementation, the 'squeeze' zdrv acts like a ydrv.
gyro
Last edited by gyro on Sun 22 May 2016, 01:58, edited 1 time in total.
I have updated the following:
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'savefile2dir' version 1.2, http://murga-linux.com/puppy/viewtopic.php?t=96472
gyro
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'savefile2dir' version 1.2, http://murga-linux.com/puppy/viewtopic.php?t=96472
gyro
Last edited by gyro on Sun 22 May 2016, 02:01, edited 1 time in total.
pupmode 13 saves
Testing in X-slacko-2.2.1n. Frugal install to CF card, pmedia=ATAFLASH, PUPMODE=13. The appearance of the 'save' dialog or not on shutdown does not track the RAMSAVEINTERVAL set in Puppy Event Manager and saved in /etc/eventmanager. Normal behavior would be that setting 0 would result in the dialog, anything else just a straight save with no dialog.
Looking at rc.shutdown, a variable ASKTOSAVE is present but not set. I added the following code at line 99 and the above behavior is obtained. May be a cleaner way to do this, just a suggestion.
Looking at rc.shutdown, a variable ASKTOSAVE is present but not set. I added the following code at line 99 and the above behavior is obtained. May be a cleaner way to do this, just a suggestion.
Code: Select all
if [ $RAMSAVEINTERVAL = 0 ] ; then #141118, Marv
ASKTOSAVE=true
else
ASKTOSAVE=false
fi
Pups currently in kennel :D Older LxPupSc and X-slacko-4.4 for my users; LxPupSc, LxPupSc64 and upupEF for me. All good pups indeed, and all running savefiles for look'n'feel only. Browsers, etc. solely from SFS.
Re: pupmode 13 saves
Not in X-slacko currently but in Tahr/Slacko6 the ASKTOSAVE variable is set from the eventmanager > Save Session tab.Marv wrote: Looking at rc.shutdown, a variable ASKTOSAVE is present but not set.
As soon as "Save interval" is set to "0" an 'ask to save' checkbox appears.
== [url=http://www.catb.org/esr/faqs/smart-questions.html]Here is how to solve your[/url] [url=https://www.chiark.greenend.org.uk/~sgtatham/bugs.html]Linux problems fast[/url] ==
Re: pupmode 13 saves
Thanks, that makes sense. For now I'll export it (set to false) from /etc/profile.local in X-slacko leaving rc.shutdown untouched.mavrothal wrote:Not in X-slacko currently but in Tahr/Slacko6 the ASKTOSAVE variable is set from the eventmanager > Save Session tab.Marv wrote: Looking at rc.shutdown, a variable ASKTOSAVE is present but not set.
As soon as "Save interval" is set to "0" an 'ask to save' checkbox appears.
Pups currently in kennel :D Older LxPupSc and X-slacko-4.4 for my users; LxPupSc, LxPupSc64 and upupEF for me. All good pups indeed, and all running savefiles for look'n'feel only. Browsers, etc. solely from SFS.
snapmergepuppy for Dpup Wheezy 3.5.2.11
I've done more testing of pupmode=13 in Wheezy 3.5.2.11, and have come up with 2 suggestions for extra patches for 'snapmergepuppy'.
Patch to tidy up symbolic link stuff:This is just an efficiency thing, since $BASE is used a lot in the following code, decode the link once here so the system doesn't have to do it lots of times later. I've no idea if it makes any significant difference.
Patch to fix saving of '/dev':This causes 'snapmergepuppy' to ignore '/dev/tty*'.
This should probably be done by modifying the 'find' line.
In Dpup Wheezy 3.5.2.11 with a savefolder using symbolic links, the partition was not unmounted cleanly. Omitting '/dev/tty*' from the file copy in 'snapmergepuppy' produced a clean unmount.
This does not make any sense to me. I fail to discern the connection. But it seems to work this way.
Interestingly Wheezy didn't seem to mind if I omitted '/dev' altogether.
Edit: Adding "|^dev/tty" to the list of exceptions on the first 'grep' on the 'find' line works, and is a neater solution.
Note: TahrPup 6.0 does not have this problem.
Since I'm already modifying 'init', I add an 'e2fsck' command in 'mnt_fnc', in my puppies.
gyro
Patch to tidy up symbolic link stuff:
Code: Select all
--- snapmergepuppy.orig 2014-10-06 18:01:55.000000000 +1000
+++ snapmergepuppy 2014-11-24 04:36:28.138255092 +1000
@@ -62,6 +62,7 @@
if [ -L $BASE ]; then #we have savefolder based on symbolic links
BASEMTP="/initrd${PUP_HOME}"
+ BASE="`readlink -n -m $BASE`"
else
BASEMTP="$BASE"
fi
Patch to fix saving of '/dev':
Code: Select all
--- snapmergepuppy.orig 2014-11-27 03:29:05.466244219 +1000
+++ snapmergepuppy 2014-11-27 03:17:33.000000000 +1000
@@ -143,6 +143,8 @@
while read N
do
+ [ "${N%%/*}" = "dev" ] && [ "${N:4:3}" = "tty" ] && continue
+
#v4.01 graceful exit if shutdown X (see /usr/X11R7/bin/restartwm,wmreboot,wmpoweroff)...
[ "$XRUNNING" = "yes" ] && [ -f /tmp/wmexitmode.txt ] && exit
This should probably be done by modifying the 'find' line.
In Dpup Wheezy 3.5.2.11 with a savefolder using symbolic links, the partition was not unmounted cleanly. Omitting '/dev/tty*' from the file copy in 'snapmergepuppy' produced a clean unmount.
This does not make any sense to me. I fail to discern the connection. But it seems to work this way.
Interestingly Wheezy didn't seem to mind if I omitted '/dev' altogether.
Edit: Adding "|^dev/tty" to the list of exceptions on the first 'grep' on the 'find' line works, and is a neater solution.
Note: TahrPup 6.0 does not have this problem.
Since I'm already modifying 'init', I add an 'e2fsck' command in 'mnt_fnc', in my puppies.
gyro
I have updated the following:
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'savefile2dir' version 1.3, http://murga-linux.com/puppy/viewtopic.php?t=96472,
and the latest 'snapmergepuppy'.
Hopefully this is the last update.
gyro
http://www.fishprogs.software/puppy/rar ... .9.9.2.sfs
http://www.fishprogs.software/puppy/sla ... ko_5.7.sfs
http://www.fishprogs.software/puppy/sla ... _5.9.3.sfs
http://www.fishprogs.software/puppy/squ ... 3.4.12.sfs
http://www.fishprogs.software/puppy/squ ... .6.2.1.sfs
http://www.fishprogs.software/puppy/tah ... hr_6.0.sfs
http://www.fishprogs.software/puppy/whe ... 5.2.11.sfs
They now contain the latest 'savefile2dir' version 1.3, http://murga-linux.com/puppy/viewtopic.php?t=96472,
and the latest 'snapmergepuppy'.
Hopefully this is the last update.
gyro
Last edited by gyro on Sun 22 May 2016, 02:03, edited 1 time in total.
patch 'snapmergepuppy' to omit '/dev/tty*'
Just in case it is useful to somebody, I have atached the real patch file for Dpup Wheezy's 'snapmergrepuppy' to omit '/dev/tty*' from the list of files to copy.
(It doesn't look very clear in the forum as "code" because the long lines wrap.)
gyro
(It doesn't look very clear in the forum as "code" because the long lines wrap.)
gyro
- Attachments
-
- snapmergepuppy.devfix.diff.gz
- 'gunzip' it to produce the .diff file.
- (546 Bytes) Downloaded 412 times
Slacko64 5.9.1
Updated packages are now available for Slacko64 5.9.1:
http://www.fishprogs.software/puppy/slacko64/initrd.gz
http://www.fishprogs.software/puppy/sla ... _5.9.1.sfs
gyro
http://www.fishprogs.software/puppy/slacko64/initrd.gz
http://www.fishprogs.software/puppy/sla ... _5.9.1.sfs
gyro
Last edited by gyro on Sun 22 May 2016, 02:03, edited 1 time in total.