janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-26 23:23:55 +01:00
Code Activity

integrate-distro.sh: Successfully integrated copilot image (booting untested)

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-11-01 15:53:12 +00:00
commit fb1149f8c8
1 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

45
scripts/integrate-distro.sh
View file

@ -290,8 +290,10 @@ tumbleweed)
uuid-devel uuid-devel
" "
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 #rpm_kernel_version=4.8.0_rc6_jux+-1
kernel_version=4.8.0-swm+
rpm_kernel_version=4.8.0_swm+-5
;; ;;
esac esac
@ -637,7 +639,8 @@ create_partition_table()
create_file_systems() 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 mkswap $install_dev_swap
run mkfs -t ext4 $install_dev_root run mkfs -t ext4 $install_dev_root
} }
@ -726,33 +729,36 @@ EOT
zypper_repos_update() zypper_repos_update()
{ {
_cat << EOT | grep -v "^ *#" # need to do this, as empty list breaks for loop in setup_zypper_repos()
|#distro-non-oss 0 ftp://ftp/pub/mirror/suse/distribution/$suse_version/repo/non-oss return 0
|#update 0 ftp://ftp/pub/mirror/suse/update/$suse_version 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 EOT
} }
zypper_repos_payload() zypper_repos_payload()
{ {
_cat << EOT | grep -v "^ *#" 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.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.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 ftp.priv.lcl 5 ftp://dspdev:123qweasd@ftp.priv.lcl/pub/local/packages/suse/$suse_version
EOT EOT
} }
zypper_repos_special() zypper_repos_special()
{ {
_cat << EOT | grep -v "^ *#" return 0
|#jengelh 0 ftp://ftp/pub/mirror/gwdg/pub/linux/misc/suser-jengelh/openSUSE_$suse_version cat <<- EOT | grep -v "^ *#"
|videolan 0 ftp://ftp/pub/mirror/videolan/pub/videolan/vlc/SuSE/$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
EOT EOT
} }
zypper_repos() zypper_repos()
{ {
local repo local repo cmd
for repo in $@; do for repo in $*; do
zypper_repos_$repo zypper_repos_$repo
done done
} }
@ -1184,7 +1190,9 @@ cmd_install()
#undo_rpmnew #undo_rpmnew
use_host_files /etc/hosts /etc/resolv.conf /etc/sysconfig/security /etc/nsswitch.conf \ 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 run_chroot install -d -m 755 /etc/dhcpd.conf.d
@ -1222,7 +1230,6 @@ cmd_install()
run_hook pkg-installed run_hook pkg-installed
fi # test
export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs export CVSROOT=:ext:$scm_user@cvs.jannet.de:/home/jannet/arc/cvs
echo "=== running jcs fetch" echo "=== running jcs fetch"
run_chroot jcs fetch run_chroot jcs fetch
@ -1234,6 +1241,8 @@ cmd_install()
# FIXME: this does not work off a netboot distro # FIXME: this does not work off a netboot distro
slapcat | chroot $root /usr/sbin/slapadd -qw slapcat | chroot $root /usr/sbin/slapadd -qw
fi # test
[ "$install_dev" ] && setup_boot_loader_local [ "$install_dev" ] && setup_boot_loader_local
setup_boot_loader_net setup_boot_loader_net
run_chroot ln -sf vmlinuz-$kernel_files_version /boot/vmlinuz 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/sdc) install_grub_dev_num=2;;
/dev/sdd) install_grub_dev_num=3;; /dev/sdd) install_grub_dev_num=3;;
/dev/sde) install_grub_dev_num=4;; /dev/sde) install_grub_dev_num=4;;
/dev/nbd*|/dev/loop*) /dev/nbd*)
install_grub_dev_num=${d/\/dev\/nbd/};; install_grub_dev_num=${d/\/dev\/nbd/};;
/dev/loop*) /dev/loop*)
install_grub_dev_num=0;; install_grub_dev_num=0;;