janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-19 21:27:39 +01:00
Code Activity

integrate-distro.sh: Add support for config sections [fstab] and [pkgs.xxx.all]

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

53
scripts/integrate-distro.sh
View file

@ -598,6 +598,14 @@ cfg_default()
[repos.special] [repos.special]
#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
[fstab]
proc /proc proc defaults 0 0
sysfs /sys sysfs noauto 0 0
debugfs /sys/kernel/debug debugfs noauto 0 0
usbfs /proc/bus/usb usbfs noauto 0 0
devpts /dev/pts devpts mode=0620,gid=5 0 0
/usr/share/syslinux /srv/nfs/boot/pxe/bin auto bind 0 0
EOT EOT
} }
@ -853,26 +861,21 @@ init_root_password_file()
} }
} }
make_etc_fstab() pkgs()
{ {
_cat<<EOT local flavour="$1"
|proc /proc proc defaults 0 0 # TODO: add remove, add and other package flavours
|sysfs /sys sysfs noauto 0 0 if have_cfg_file_section "pkgs.$flavour.all"; then
|debugfs /sys/kernel/debug debugfs noauto 0 0 cfg_file_section "pkgs.$flavour.all"
|usbfs /proc/bus/usb usbfs noauto 0 0 return 0
|devpts /dev/pts devpts mode=0620,gid=5 0 0 fi
|/usr/share/syslinux /srv/nfs/boot/pxe/bin auto bind 0 0 local var="$flavour"_pkgs
EOT eval echo \$$var
#|/dev/sda2 /boot auto defaults 0 0
} }
make_etc_fstab_local_boot() make_etc_fstab()
{ {
_cat<<EOT cfg_section fstab
|$run_dev_swap swap swap defaults 0 0
|$run_dev_root / ext4 acl,user_xattr 1 1
|$run_dev_boot /boot ext3 acl,user_xattr 1 2
EOT
} }
make_etc_hosts() make_etc_hosts()
@ -932,12 +935,12 @@ make_netboot_etc_openldap_ldap_conf()
make_netboot_etc_fstab() make_netboot_etc_fstab()
{ {
make_etc_fstab make_etc_fstab | grep -v /dev/sd
_cat<<EOT cat<<-EOT
|
|# netboot client # netboot client
|bootsrv:/var/cores /var/cores nfs rw,rsize=8192,wsize=8192,async 0 0 bootsrv:/var/cores /var/cores nfs rw,rsize=8192,wsize=8192,async 0 0
EOT EOT
} }
make_sysconfig_bootloader() make_sysconfig_bootloader()
@ -1267,13 +1270,13 @@ cmd_install()
echo "=== refreshing <" echo "=== refreshing <"
echo "=== installing payload packages >" echo "=== installing payload packages >"
run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses $payload_pkgs run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses `pkgs payload`
echo "=== installing payload packages <" echo "=== installing payload packages <"
run setup_zypper_repos special run setup_zypper_repos special
run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses $special_pkgs run_chroot zypper $zypper_global_opts install --auto-agree-with-licenses `pkgs special`
# run_chroot zypper $zypper_global_opts -t srcpackage --download-only $payload_pkgs # run_chroot zypper $zypper_global_opts -t srcpackage --download-only `pkgs payload`
#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 # TODO: should be done by package manager post install script