janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-18 21:13:56 +01:00
Code Activity

integrate-distro.sh: Ongoing improvements

Browse source 
- Script stops during execution of reset_host_files(), fix by
    enclosing code blocks in "set +e"
  - Fix syntax error in link of /boot/initrd-local

Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2014-03-28 13:11:30 +00:00
commit ea7732b0a9
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
scripts/integrate-distro.sh
View file

@ -159,7 +159,6 @@ case $suse_version in
aufs-util aufs-util
db48-utils db48-utils
" "
special_pkgs=" special_pkgs="
jux-run jux-run
jux-client-run jux-client-run
@ -171,6 +170,7 @@ case $suse_version in
ftp-server-run ftp-server-run
bprof-run bprof-run
" "
# currently unused variable # currently unused variable
devel_pkgs=" devel_pkgs="
ant ant
@ -849,6 +849,7 @@ use_host_files()
reset_host_files() reset_host_files()
{ {
set +e
local f e h p local f e h p
for f in $host_files; do for f in $host_files; do
p=$root/$f.diff p=$root/$f.diff
@ -870,6 +871,8 @@ reset_host_files()
rm -f $p rm -f $p
done done
host_files="" host_files=""
set -e
return 0
} }
setup_boot_loader_local() setup_boot_loader_local()
@ -905,7 +908,7 @@ EOT
| -M /boot/System.map-$kernel_version \\ | -M /boot/System.map-$kernel_version \\
| -m "$initrd_modules" \\ | -m "$initrd_modules" \\
| -d $install_dev_root | -d $install_dev_root
|ln -sf initrd-local-$kernel_version /boot/initrd-local) |ln -sf initrd-local-$kernel_version /boot/initrd-local
|chmod 644 /boot/initrd-local-$kernel_version |chmod 644 /boot/initrd-local-$kernel_version
EOT EOT
chmod 755 $root$mkinitrd_sh chmod 755 $root$mkinitrd_sh