almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

ActivateImage links correction

Browse Source 
Loading the iso image into a read-only ramdisk caused some issues
due to the activatImage method cp commands. With this commit the
symlinks are consistent during the preinit phase and also before
running the cp command it is tested we are not in a read-only
filesystem.

This commit is a port form openSUSE/kiwi#613 PR
This commit is contained in:
David Cassany 2016-11-08 12:23:35 +01:00
parent abfb9859ab
commit 2e9769e8b0
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
kiwi/boot/functions.sh
View File

@ -6290,6 +6290,7 @@ function activateImage {
local cdDir=/livecd
if [ -d $cdDir ];then
mkdir -p $prefix/$cdDir && mount --move /$cdDir $prefix/$cdDir
rm -r $cdDir && ln -s $prefix/$cdDir $cdDir
if [ -d /cow ];then
mkdir -p $prefix/cow && mount --move /cow $prefix/cow
fi
@ -6340,15 +6341,19 @@ function activateImage {
if [ ! -e $prefix/$killall5 ]; then
touch $prefix/killall5.from-initrd
fi
if ! cp -f -a $killall5 $prefix/$killall5;then
systemException "Failed to copy: killall5" "reboot"
if touch $(dirname $prefix/$killall5); then
if ! cp -f -a $killall5 $prefix/$killall5; then
systemException "Failed to copy: killall5" "reboot"
fi
fi
local pidof=$(lookup pidof)
if [ ! -e $prefix/$pidof ];then
touch $prefix/pidof.from-initrd
fi
if ! cp -f -a $pidof $prefix/$pidof;then
systemException "Failed to copy: pidof" "reboot"
if touch $(dirname $prefix/$pidof); then
if ! cp -f -a $pidof $prefix/$pidof;then
systemException "Failed to copy: pidof" "reboot"
fi
fi
}
#======================================