search for: 89821f3

Pass -a to each tee invocation, otherwise just the last one (so only for the last script executed) will appear in the log file. --- customize/firstboot.ml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/customize/firstboot.ml b/customize/firstboot.ml index 89821f3..0b95708 100644 --- a/customize/firstboot.ml +++ b/customize/firstboot.ml @@ -50,8 +50,8 @@ d=%s/scripts d_done=%s/scripts-done logfile=~root/virt-sysprep-firstboot.log -echo \"$0\" \"$@\" 2>&1 | tee $logfile -echo \"Scripts dir: $d\" 2>&1 | tee $logf...

...all the files found in scripts-done, as they have been run (or at least attempted) in a previous boot. This fixes RHBZ#1159651. --- customize/firstboot.ml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/customize/firstboot.ml b/customize/firstboot.ml index 67b9479..89821f3 100644 --- a/customize/firstboot.ml +++ b/customize/firstboot.ml @@ -47,6 +47,7 @@ module Linux = struct ### END INIT INFO d=%s/scripts +d_done=%s/scripts-done logfile=~root/virt-sysprep-firstboot.log echo \"$0\" \"$@\" 2>&1 | tee $logfile @@ -54,16 +55,20 @@ echo...

If a script does not finish, hangs, etc, it would be executed again at the next boot, since the injected firstboot.sh helper removes it only after it finished. Since firstboot.sh only runs executable files, then remove the executable attributes before running it, so it will not run again. Also, remove any file found in the scripts subdirectory, be it just run or run in a previous boot. This