From fb1149f8c89bb9b492a234a16916fb8e8f4d592c Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 1 Nov 2016 15:53:12 +0000 Subject: [PATCH] integrate-distro.sh: Successfully integrated copilot image (booting untested) Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 51 ++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index de2061bb..a430b244 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -290,8 +290,10 @@ tumbleweed) uuid-devel " - kernel_version=4.8.0_rc6_jux+-1 - rpm_kernel_version=4.8.0_rc6_jux+-1 + #kernel_version=4.8.0_rc6_jux+-1 + #rpm_kernel_version=4.8.0_rc6_jux+-1 + kernel_version=4.8.0-swm+ + rpm_kernel_version=4.8.0_swm+-5 ;; esac @@ -637,7 +639,8 @@ create_partition_table() create_file_systems() { - run mkfs -t ext4 $install_dev_boot + #run mkfs -t ext4 $install_dev_boot + run mkfs -t ext3 $install_dev_boot run mkswap $install_dev_swap run mkfs -t ext4 $install_dev_root } @@ -726,33 +729,36 @@ EOT zypper_repos_update() { - _cat << EOT | grep -v "^ *#" - |#distro-non-oss 0 ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss - |#update 0 ftp://ftp/pub/mirror/suse/update/$suse_version -EOT + # need to do this, as empty list breaks for loop in setup_zypper_repos() + return 0 + cat <<- EOT | grep -v "^ *#" + #distro-non-oss 0 ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss + #update 0 ftp://ftp/pub/mirror/suse/update/$suse_version + EOT } zypper_repos_payload() { - _cat << EOT | grep -v "^ *#" - |#ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source - |ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source - |ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version -EOT + cat <<- EOT | grep -v "^ *#" + #ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp.jannet.de/pub/packages/linux/suse/$suse_version/inst-source + ftp.jannet.de 10 ftp://dspdev:123qweasd@ftp/pub/mirror/jannet/ftp/pub/packages/linux/suse/$suse_version/inst-source + ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version + EOT } zypper_repos_special() { - _cat << EOT | grep -v "^ *#" - |#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 -EOT + return 0 + cat <<- EOT | grep -v "^ *#" + #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 + EOT } zypper_repos() { - local repo - for repo in $@; do + local repo cmd + for repo in $*; do zypper_repos_$repo done } @@ -1184,7 +1190,9 @@ cmd_install() #undo_rpmnew use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf \ - /etc/passwd /etc/group /etc/certs /etc/opt/bprof/bprof.secret + /etc/passwd /etc/group /etc/certs + + #/etc/opt/bprof/bprof.secret run_chroot install -d -m 755 /etc/dhcpd.conf.d @@ -1222,7 +1230,6 @@ cmd_install() run_hook pkg-installed - fi # test export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs echo "=== running jcs fetch" run_chroot jcs fetch @@ -1234,6 +1241,8 @@ cmd_install() # FIXME: this does not work off a netboot distro slapcat | chroot $root /usr/sbin/slapadd -qw + fi # test + [ "$install_dev" ] && setup_boot_loader_local setup_boot_loader_net run_chroot ln -sf vmlinuz-$kernel_files_version /boot/vmlinuz @@ -1342,7 +1351,7 @@ if [ "$install_dev" ]; then /dev/sdc) install_grub_dev_num=2;; /dev/sdd) install_grub_dev_num=3;; /dev/sde) install_grub_dev_num=4;; - /dev/nbd*|/dev/loop*) + /dev/nbd*) install_grub_dev_num=${d/\/dev\/nbd/};; /dev/loop*) install_grub_dev_num=0;;