janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-24 22:50:39 +01:00
Code Activity

integrate-distro.sh: Make [repos.after-install] work

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2017-01-23 12:27:59 +00:00
commit 9189a42ff6
1 changed files with 7 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

40
scripts/integrate-distro.sh
View file

@ -853,37 +853,11 @@ unmount_devices()
rm -f $ssh_auth_sock rm -f $ssh_auth_sock
} }
# TODO: remove this >
zypper_repos_base()
{
cfg_section repos.base
}
zypper_repos_update()
{
# need to do this, as empty list breaks for loop in setup_zypper_repos()
return 0
cfg_section repos.update
}
zypper_repos_payload()
{
cfg_section repos.payload
}
zypper_repos_special()
{
return 0
cfg_section repos.special
}
# TODO: remove this <
zypper_repos() zypper_repos()
{ {
local repo cmd local repo
for repo in $*; do for repo in $*; do
#cfg_section repos.$repo # hangs cfg_section repos.$repo
zypper_repos_$repo
done done
} }
@ -1345,11 +1319,6 @@ cmd_install()
#kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'` #kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'` kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'`
if have_cfg_file_section repos.after-install; then
run_chroot zypper mr --all --disable
run setup_zypper_repos after-install
fi
# TODO: should be done by package manager post install script # TODO: should be done by package manager post install script
run_chroot /opt/ytools/bin/jcs init run_chroot /opt/ytools/bin/jcs init
@ -1399,6 +1368,11 @@ cmd_install()
run_chroot install -m 777 -d /srv/nfs/var/cores run_chroot install -m 777 -d /srv/nfs/var/cores
run_chroot install -m 777 -d /var/cores run_chroot install -m 777 -d /var/cores
if have_cfg_file_section repos.after-install; then
run_chroot zypper mr --all --disable
run setup_zypper_repos after-install
fi
unmount_devices unmount_devices
[ -w "$install_dev" ] || { [ -w "$install_dev" ] || {
install -d -m 755 $root/../rw install -d -m 755 $root/../rw