mirror of
ssh://git.janware.com/srv/git/janware/proj/jw-pkg
synced 2026-01-24 14:50:38 +01:00
integrate-distro.sh: Now runs through with suse-tumbleweed
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
bf056c61cc
commit
cfeaca6fff
1 changed files with 24 additions and 10 deletions
|
|
@ -17,6 +17,9 @@ kernel_flavour=
|
||||||
|
|
||||||
case $suse_version in
|
case $suse_version in
|
||||||
11.4)
|
11.4)
|
||||||
|
services="
|
||||||
|
ldap
|
||||||
|
"
|
||||||
base_pkgs="
|
base_pkgs="
|
||||||
sysvinit
|
sysvinit
|
||||||
"
|
"
|
||||||
|
|
@ -74,6 +77,9 @@ case $suse_version in
|
||||||
#rpm_kernel_version=3.2.0-1
|
#rpm_kernel_version=3.2.0-1
|
||||||
;;
|
;;
|
||||||
12.2)
|
12.2)
|
||||||
|
services="
|
||||||
|
ldap
|
||||||
|
"
|
||||||
base_pkgs="
|
base_pkgs="
|
||||||
sysvinit
|
sysvinit
|
||||||
"
|
"
|
||||||
|
|
@ -91,6 +97,9 @@ case $suse_version in
|
||||||
rpm_kernel_version=3.7.8~jng11-1
|
rpm_kernel_version=3.7.8~jng11-1
|
||||||
;;
|
;;
|
||||||
12.3)
|
12.3)
|
||||||
|
services="
|
||||||
|
ldap
|
||||||
|
"
|
||||||
base_pkgs="
|
base_pkgs="
|
||||||
module-init-tools
|
module-init-tools
|
||||||
sysvinit
|
sysvinit
|
||||||
|
|
@ -157,6 +166,9 @@ case $suse_version in
|
||||||
rpm_kernel_version=3.9.9~jng20-1.2
|
rpm_kernel_version=3.9.9~jng20-1.2
|
||||||
;;
|
;;
|
||||||
13.1)
|
13.1)
|
||||||
|
services="
|
||||||
|
ldap
|
||||||
|
"
|
||||||
base_pkgs="
|
base_pkgs="
|
||||||
aaa_base
|
aaa_base
|
||||||
module-init-tools
|
module-init-tools
|
||||||
|
|
@ -219,6 +231,9 @@ case $suse_version in
|
||||||
rpm_kernel_version=3.12.7-jux+
|
rpm_kernel_version=3.12.7-jux+
|
||||||
;;
|
;;
|
||||||
tumbleweed)
|
tumbleweed)
|
||||||
|
services="
|
||||||
|
slapd
|
||||||
|
"
|
||||||
base_pkgs="
|
base_pkgs="
|
||||||
aaa_base
|
aaa_base
|
||||||
module-init-tools
|
module-init-tools
|
||||||
|
|
@ -235,7 +250,7 @@ tumbleweed)
|
||||||
acpid
|
acpid
|
||||||
"
|
"
|
||||||
special_pkgs="
|
special_pkgs="
|
||||||
jux-run-1.2.2-119p02
|
jux-run
|
||||||
jux-client-run
|
jux-client-run
|
||||||
feedfsd-run
|
feedfsd-run
|
||||||
feedfs-local-run
|
feedfs-local-run
|
||||||
|
|
@ -694,7 +709,7 @@ EOT
|
||||||
zypper_repos_special()
|
zypper_repos_special()
|
||||||
{
|
{
|
||||||
_cat << EOT | grep -v "^ *#"
|
_cat << EOT | grep -v "^ *#"
|
||||||
|jengelh 0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
|
|#jengelh 0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version
|
||||||
|videolan 0 ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$suse_version
|
|videolan 0 ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$suse_version
|
||||||
EOT
|
EOT
|
||||||
}
|
}
|
||||||
|
|
@ -1082,25 +1097,21 @@ setup_root_directory()
|
||||||
|
|
||||||
insserv_all()
|
insserv_all()
|
||||||
{
|
{
|
||||||
local services="
|
local local_services="
|
||||||
boot.juxearly
|
boot.juxearly
|
||||||
boot.bprof
|
boot.bprof
|
||||||
sshd
|
sshd
|
||||||
ldap
|
|
||||||
jux
|
jux
|
||||||
"
|
$services
|
||||||
services="
|
|
||||||
sshd
|
|
||||||
ldap
|
|
||||||
"
|
"
|
||||||
|
|
||||||
case $suse_version in
|
case $suse_version in
|
||||||
11.4)
|
11.4)
|
||||||
run_chroot /sbin/insserv -de $services
|
run_chroot /sbin/insserv -de $local_services
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
local s
|
local s
|
||||||
for s in $services; do
|
for s in $local_services; do
|
||||||
run_chroot systemctl enable $s.service
|
run_chroot systemctl enable $s.service
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
|
|
@ -1162,6 +1173,9 @@ cmd_install()
|
||||||
# run_chroot zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs
|
# run_chroot zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs
|
||||||
#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-//'`
|
||||||
|
|
||||||
|
# TODO: should be done by package manager post install script
|
||||||
|
run_chroot /opt/ytools/bin/jcs init
|
||||||
|
|
||||||
make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf
|
make_etc_jcs_jcs_conf > $root/etc/jcs/jcs.conf
|
||||||
|
|
||||||
run_chroot mkdir -p -m 700 /root/.ssh
|
run_chroot mkdir -p -m 700 /root/.ssh
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue