Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package warewulf for openSUSE:Factory checked in at 2021-10-19 23:03:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/warewulf (Old) and /work/SRC/openSUSE:Factory/.warewulf.new.1890 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "warewulf" Tue Oct 19 23:03:42 2021 rev:4 rq:926032 version:3.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/warewulf/warewulf.changes 2021-10-11 15:32:59.894977810 +0200 +++ /work/SRC/openSUSE:Factory/.warewulf.new.1890/warewulf.changes 2021-10-19 23:03:50.757273455 +0200 @@ -23 +23,10 @@ - initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch + initramfs-Going-forward-bin-or-sbin-are-mere-links-to-usr-cater-for-this.patch + * Create SUSE network configuration on provisioned system + initramfs-Add-network-handling-support-for-SUSE.patch + * Set up NTP using a SUSE network configuration + initramfs-Handle-NTP-client-configuration-for-SUSE.patch + * Add kernel-specific sysctl.conf file + Add-lib-modules-opt_kversion-sysctl.conf-to-initfs-if-present.patch + * Do not pull unneeded stuff - packages to install should be explcitly + listed or required. + vnfs-Do-not-pull-in-recommended-packages-on-SUSE.patch @@ -24,0 +34,2 @@ + * busybox.SuSE.config + * vnfs-wwmkchroot-opensuse-42.3.tmpl @@ -25,0 +37 @@ + * vnfs-wwmkchroot-opensuse-tumbleweed.tmpl Old: ---- busybox.SuSE.config initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch vnfs-wwmkchroot-opensuse-42.3.tmpl vnfs-wwmkchroot-opensuse-tumbleweed.tmpl New: ---- Add-lib-modules-opt_kversion-sysctl.conf-to-initfs-if-present.patch initramfs-Add-network-handling-support-for-SUSE.patch initramfs-Going-forward-bin-or-sbin-are-mere-links-to-usr-cater-for-this.patch initramfs-Handle-NTP-client-configuration-for-SUSE.patch vnfs-Do-not-pull-in-recommended-packages-on-SUSE.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ warewulf.spec ++++++ --- /var/tmp/diff_new_pack.gNa3jd/_old 2021-10-19 23:03:51.705273885 +0200 +++ /var/tmp/diff_new_pack.gNa3jd/_new 2021-10-19 23:03:51.709273887 +0200 @@ -35,11 +35,8 @@ Group: Productivity/Clustering/Computing URL: http://warewulf.lbl.gov/ Source0: https://github.com/warewulf/warewulf3/archive/%{version}.tar.gz#/%{name}3-%{version}.tar.gz -Source1: busybox.SuSE.config Source100: install-recipe.md Source101: install-recipe-vm.md -Source301: vnfs-wwmkchroot-opensuse-42.3.tmpl -Source302: vnfs-wwmkchroot-opensuse-tumbleweed.tmpl Patch0: wwinit-Check-if-service-is-enabled-before-enabling-it.patch Patch1: Perl-Escape-left-curly-brace-properly-in-regexps-for-perl-5.26.patch Patch2: wwinit-If-no-ntp-key-file-is-present-comment-it-out-in-new-config-143.patch @@ -79,12 +76,20 @@ Patch35: cluster-Don-t-attempt-ntp-configuration-when-chrony-is-found.patch Patch36: cluster-If-hostname-doesn-t-contain-the-domain-try-to-derive-this-from-FQDN.patch Patch37: provision-Unify-handling-of-initramfs-location.patch -Patch38: initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch +Patch38: initramfs-Going-forward-bin-or-sbin-are-mere-links-to-usr-cater-for-this.patch +Patch39: initramfs-Add-network-handling-support-for-SUSE.patch +Patch40: initramfs-Handle-NTP-client-configuration-for-SUSE.patch +Patch41: Add-lib-modules-opt_kversion-sysctl.conf-to-initfs-if-present.patch +Patch42: vnfs-Do-not-pull-in-recommended-packages-on-SUSE.patch %if "%{?flavor}" != "common" BuildRequires: bsdtar +%if 0%{suse_version} > 1500 +BuildRequires: busybox-warewulf3 +%else BuildRequires: busybox BuildRequires: busybox-static +%endif BuildRequires: device-mapper-devel BuildRequires: e2fsprogs BuildRequires: haveged @@ -383,13 +388,14 @@ %patch13 -p1 %patch14 -p1 %patch37 -p1 -%patch38 -p1 # IPXE sources not needed #%patch17 -p1 %patch23 -p1 %patch24 -p1 %patch27 -p1 -cp %{SOURCE1} ./provision/initramfs/busybox.config +%patch38 -p1 +%patch39 -p1 +%patch40 -p1 # vnfs %patch5 -p1 %patch10 -p1 @@ -398,6 +404,8 @@ %patch20 -p1 %patch21 -p1 %patch31 -p1 +%patch41 -p1 +%patch42 -p1 # cluster %patch2 -p1 %patch3 -p1 @@ -449,12 +457,14 @@ cd provision autoreconf -f -i -busybox_links=%_datadir/busybox/busybox-static.links +busybox_links=%_datadir/busybox/busybox-warewulf3.links test -e $busybox_links || busybox_links=%_datadir/busybox/busybox.links +busybox_bin=%_bindir/busybox-warewulf3 +test -e $busybox_bin || busybox_bin=%_bindir/busybox-static %if 0%{?full_build} %configure \ --enable-cross-compile \ - --with-local-busybox=%_bindir/busybox-static \ + --with-local-busybox=$busybox_bin \ --with-busybox-links-file=$busybox_links \ --with-local-e2fsprogs=%_prefix/sbin/mkfs.ext4 \ --with-local-ipxe_undionly=%_datadir/ipxe/undionly.kpxe \ @@ -467,7 +477,7 @@ --with-apache2moddir=%_libdir/apache2 %else %configure \ - --with-local-busybox=%_bindir/busybox-static \ + --with-local-busybox=$busybox_bin \ --with-busybox-links-file=$busybox_links \ --with-local-e2fsprogs=%_prefix/sbin/mkfs.ext4 \ --with-local-libarchive=%_bindir/bsdtar \ @@ -489,9 +499,9 @@ mkdir -p %{buildroot}/%{_docdir} cd .. -echo "g %{name} -" > system-user-%{name}.conf -%sysusers_generate_pre system-user-%{name}.conf %{name} system-user-%{name}.conf -install -D -m 644 system-user-%{name}.conf %{buildroot}%{_sysusersdir}/system-user-%{name}.conf +echo "g %{name} -" > system-group-%{name}.conf +%sysusers_generate_pre system-group-%{name}.conf %{name} system-group-%{name}.conf +install -D -m 644 system-group-%{name}.conf %{buildroot}%{_sysusersdir}/system-group-%{name}.conf %else @@ -503,8 +513,10 @@ done # vnfs -install %{SOURCE301} %{buildroot}/%{_libexecdir}/warewulf/wwmkchroot/opensuse-42.3.tmpl -install %{SOURCE302} %{buildroot}/%{_libexecdir}/warewulf/wwmkchroot/opensuse-tumbleweed.tmpl +# Don't exclude these +for i in /var/log/ /usr/lib/locale /usr/share/locale ; do + sed -i -e "/${i//\//\\\/}/s@\(.*\)@#\1@g" %{buildroot}/%{_sysconfdir}/warewulf/vnfs.conf +done %endif # x86_64 @@ -573,7 +585,7 @@ %attr(0640, root, warewulf) %config(noreplace) %{_sysconfdir}/warewulf/database-root.conf %attr(0644, root, warewulf) %config(noreplace) %{_sysconfdir}/warewulf/defaults/node.conf %{perl_vendorlib}/* -%{_sysusersdir}/system-user-%{name}.conf +%{_sysusersdir}/system-group-%{name}.conf %files doc %defattr(-, root, root) ++++++ Add-lib-modules-opt_kversion-sysctl.conf-to-initfs-if-present.patch ++++++ From: Egbert Eich <[email protected]> Date: Thu Oct 14 13:51:35 2021 +0200 Subject: Add /lib/modules/$opt_kversion/sysctl.conf to initfs if present Patch-mainline: Not yet Git-commit: 080e7062a53926170670aecb74e4921c8878f5cb References: Kernels may ship their own sysctl.conf with settings specific to the respective kernel version. This is shipped with the kernel itself in the module directory. Signed-off-by: Egbert Eich <[email protected]> --- provision/initramfs/capabilities/provision-vnfs/70-kernelmodules | 4 ++++ vnfs/bin/wwbootstrap | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules b/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules index 7f763f7..2ec5ffb 100644 --- a/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules +++ b/provision/initramfs/capabilities/provision-vnfs/70-kernelmodules @@ -29,4 +29,8 @@ if [ -x "${NEWROOT}${DEPMOD}" ]; then chroot "${NEWROOT}" /sbin/depmod -a fi +if [ -e "${NEWROOT}"/lib/modules/"${KVERSION}"/sysctl.conf ]; then + ln -s /lib/modules/"${KVERSION}"/sysctl.conf "${NEWROOT}"/boot/sysctl.conf-"${KVERSION}" +fi + exit 0 diff --git a/vnfs/bin/wwbootstrap b/vnfs/bin/wwbootstrap index 149f6f4..e509ee3 100644 --- a/vnfs/bin/wwbootstrap +++ b/vnfs/bin/wwbootstrap @@ -260,6 +260,12 @@ if ($config->get("drivers")) { copy("$opt_chroot/lib/modules/$opt_kversion/modules.order", "$tmpdir/initramfs/lib/modules/$opt_kversion/modules.order"); copy("$opt_chroot/lib/modules/$opt_kversion/modules.builtin", "$tmpdir/initramfs/lib/modules/$opt_kversion/modules.builtin"); + if (-e "$opt_chroot/lib/modules/$opt_kversion/sysctl.conf" ) { + copy("$opt_chroot/lib/modules/$opt_kversion/sysctl.conf", "$tmpdir/initramfs/lib/modules/$opt_kversion/sysctl.conf"); + } elsif ( -e "$opt_chroot/boot/sysctl.conf-$opt_kversion" ) { + copy("$opt_chroot/boot/sysctl.conf-$opt_kversion", "$tmpdir/initramfs/lib/modules/$opt_kversion/sysctl.conf"); + } + if ($module_count > 0) { &nprint("Number of drivers included in bootstrap: $module_count\n"); &dprint("Running depmod\n"); ++++++ cluster-If-hostname-doesn-t-contain-the-domain-try-to-derive-this-from-FQDN.patch ++++++ --- /var/tmp/diff_new_pack.gNa3jd/_old 2021-10-19 23:03:51.765273912 +0200 +++ /var/tmp/diff_new_pack.gNa3jd/_new 2021-10-19 23:03:51.765273912 +0200 @@ -2,7 +2,7 @@ Date: Mon Oct 4 19:42:44 2021 +0200 Subject: cluster: If hostname doesn't contain the domain, try to derive this from FQDN Patch-mainline: Not yet -Git-commit: 69bcaec9ab2cee4d512c3a32760f7245fe167b65 +Git-commit: fc9adfb41ba29d83fe083248e17c3a2d03d76e16 References: SUSE doesn't include the domainname in the hostname. One may still @@ -12,20 +12,22 @@ Signed-off-by: Egbert Eich <[email protected]> --- - cluster/libexec/wwinit/30-domain.init | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + cluster/libexec/wwinit/30-domain.init | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cluster/libexec/wwinit/30-domain.init b/cluster/libexec/wwinit/30-domain.init -index ac221a5..08846c0 100644 +index ac221a5..300739a 100644 --- a/cluster/libexec/wwinit/30-domain.init +++ b/cluster/libexec/wwinit/30-domain.init -@@ -34,7 +34,11 @@ HOSTNAME=`hostname` +@@ -33,8 +33,12 @@ fi + HOSTNAME=`hostname` DOMAIN=`echo $HOSTNAME | sed -e 's/^[^\.]*\.//'` - if [ -z "$DOMAIN" -o "$HOSTNAME" == "$DOMAIN" ]; then +-if [ -z "$DOMAIN" -o "$HOSTNAME" == "$DOMAIN" ]; then - DOMAIN="cluster" ++if [ -z "$DOMAIN" -o "$HOSTNAME" = "$DOMAIN" ]; then + HOSTNAME=`hostname -f` + DOMAIN=`echo $HOSTNAME | sed -e 's/^[^\.]*\.//'` -+ if [ -z "$DOMAIN" -o "$HOSTNAME" == "$DOMAIN" ]; then ++ if [ -z "$DOMAIN" -o "$HOSTNAME" = "$DOMAIN" ]; then + DOMAIN="cluster" + fi fi ++++++ initramfs-Add-network-handling-support-for-SUSE.patch ++++++ From: Egbert Eich <[email protected]> Date: Mon Oct 11 07:32:44 2021 +0200 Subject: initramfs: Add network handling support for SUSE Patch-mainline: Not yet Git-commit: 3b41748246bd6769a939dd2a6849ecb74a45a5bb References: SUSE uses ifcfg-* files which are similar but not identical to RHEL. Also the file locations differ: RHEL stores its files in the directory /etc/sysconfig/ntwork-scripts while SUSE keeps them in the directory /etc/sysconfig/network (which is a file on RHEL). Signed-off-by: Egbert Eich <[email protected]> --- .../capabilities/provision-vnfs/50-config | 3 + provision/initramfs/init | 141 ++++++++++----------- 2 files changed, 69 insertions(+), 75 deletions(-) diff --git a/provision/initramfs/capabilities/provision-vnfs/50-config b/provision/initramfs/capabilities/provision-vnfs/50-config index 5c75b87..a5e6c9d 100644 --- a/provision/initramfs/capabilities/provision-vnfs/50-config +++ b/provision/initramfs/capabilities/provision-vnfs/50-config @@ -11,6 +11,9 @@ if [ -d "${NEWROOT}/etc/sysconfig/network-scripts" ]; then cp -f /tmp/ifcfg-* "${NEWROOT}/etc/sysconfig/network-scripts/" elif [ -d "${NEWROOT}/etc/network" ]; then cp -f /tmp/interfaces "${NEWROOT}/etc/network/" +elif [ -d "${NEWROOT}/etc/sysconfig/network" ]; then + [ /tmp/suse/if*-* != "/tmp/suse/if*-*" ] && \ + cp -f /tmp/suse/if*-* "${NEWROOT}/etc/sysconfig/network/" fi if [ -n "$HOSTNAME" ]; then diff --git a/provision/initramfs/init b/provision/initramfs/init index e3f0be2..f508cee 100644 --- a/provision/initramfs/init +++ b/provision/initramfs/init @@ -75,6 +75,69 @@ for module in `/sbin/detect`; do done wwsuccess +netconf_distro() +{ + if [ -z "$WWNETCFGFILE" ]; then + msg_white "Creating network initialization files: " + msg_gray "($OSDEVICE)" + # Debian based /etc/network/interfaces + echo "# This was created by the Warewulf bootstrap" > /tmp/interfaces + echo "auto lo" >> /tmp/interfaces + echo "iface lo inet loopback" >> /tmp/interfaces + echo '' >> /tmp/interfaces + echo "auto $OSDEVICE" >> /tmp/interfaces + echo "iface $OSDEVICE inet static" >> /tmp/interfaces + echo " address $WWIPADDR" >> /tmp/interfaces + echo " netmask $WWNETMASK" >> /tmp/interfaces + if [ -n "$WWGATEWAY" ]; then + echo " gateway $WWGATEWAY" >> /tmp/interfaces + fi + if [ -n "$HWADDR" ]; then + echo " hwaddress ether $HWADDR" >> /tmp/interfaces + fi + if [ -n "$WWMTU" ]; then + echo " mtu $WWMTU" >> /tmp/interfaces # DEB + fi + + # RHEL based ifcfg + echo "# This was created by the Warewulf bootstrap" > /tmp/ifcfg-$OSDEVICE + echo "DEVICE=$OSDEVICE" >> /tmp/ifcfg-$OSDEVICE + echo "BOOTPROTO=static" >> /tmp/ifcfg-$OSDEVICE + echo "ONBOOT=yes" >> /tmp/ifcfg-$OSDEVICE + echo "IPADDR=$WWIPADDR" >> /tmp/ifcfg-$OSDEVICE + echo "NETMASK=$WWNETMASK" >> /tmp/ifcfg-$OSDEVICE + if [ -n "$WWGATEWAY" ]; then + echo "GATEWAY=$WWGATEWAY" >> /tmp/ifcfg-$OSDEVICE + fi + if [ -n "$HWADDR" ]; then + echo "HWADDR=$HWADDR" >> /tmp/ifcfg-$OSDEVICE + fi + + if [ -n "$WWMTU" ]; then + echo "MTU=$WWMTU" >> /tmp/ifcfg-$OSDEVICE # RHEL + fi + + # SUSE based ifcfg + mkdir -p /tmp/suse + echo "# This was created by the Warewulf bootstrap" > /tmp/suse/ifcfg-$OSDEVICE + echo "NAME=$OSDEVICE" >> /tmp/suse/ifcfg-$OSDEVICE + echo "BOOTPROTO=static" >> /tmp/suse/ifcfg-$OSDEVICE + echo "STARTMODE=auto" >> /tmp/suse/ifcfg-$OSDEVICE + echo "IPADDR=$WWIPADDR" >> /tmp/suse/ifcfg-$OSDEVICE + echo "NETMASK=$WWNETMASK" >> /tmp/suse/ifcfg-$OSDEVICE + if [ -n "$HWADDR" ]; then + echo "LLADDR=$HWADDR" >> /tmp/suse/ifcfg-$OSDEVICE + fi + if [ -n "$WWMTU" ]; then + echo "MTU=$WWMTU" >> /tmp/suse/ifcfg-$OSDEVICE # RHEL + fi + if [ -n "$WWGATEWAY" ]; then + echo "default $WWGATEWAY - $OSDEVICE" >> /tmp/suse/ifcfg-$OSDEVICE + fi + wwsuccess + fi +} + ifup() { DEVICE=$1 HWADDR=$2 @@ -107,47 +170,8 @@ ifup() { wwfailure fi fi - - if [ -z "$WWNETCFGFILE" ]; then - msg_white "Creating network initialization files: " - msg_gray "($OSDEVICE)" - # Debian based /etc/network/interfaces - echo "# This was created by the Warewulf bootstrap" > /tmp/interfaces - echo "auto lo" >> /tmp/interfaces - echo "iface lo inet loopback" >> /tmp/interfaces - echo '' >> /tmp/interfaces - echo "auto $OSDEVICE" >> /tmp/interfaces - echo "iface $OSDEVICE inet static" >> /tmp/interfaces - echo " address $WWIPADDR" >> /tmp/interfaces - echo " netmask $WWNETMASK" >> /tmp/interfaces - if [ -n "$WWGATEWAY" ]; then - echo " gateway $WWGATEWAY" >> /tmp/interfaces - fi - if [ -n "$HWADDR" ]; then - echo " hwaddress ether $HWADDR" >> /tmp/interfaces - fi - - # RHEL based ifcfg - echo "# This was created by the Warewulf bootstrap" > /tmp/ifcfg-$OSDEVICE - echo "DEVICE=$OSDEVICE" >> /tmp/ifcfg-$OSDEVICE - echo "BOOTPROTO=static" >> /tmp/ifcfg-$OSDEVICE - echo "ONBOOT=yes" >> /tmp/ifcfg-$OSDEVICE - echo "IPADDR=$WWIPADDR" >> /tmp/ifcfg-$OSDEVICE - echo "NETMASK=$WWNETMASK" >> /tmp/ifcfg-$OSDEVICE - if [ -n "$WWGATEWAY" ]; then - echo "GATEWAY=$WWGATEWAY" >> /tmp/ifcfg-$OSDEVICE - fi - if [ -n "$HWADDR" ]; then - echo "HWADDR=$HWADDR" >> /tmp/ifcfg-$OSDEVICE - fi - - if [ -n "$WWMTU" ]; then - echo "MTU=$WWMTU" >> /tmp/ifcfg-$OSDEVICE # RHEL - echo " mtu $WWMTU" >> /tmp/interfaces # DEB - fi - wwsuccess - fi - + netconf_distro + COUNT=0 msg_white "Trying to reach the master node at $WWMASTER " while [ $COUNT -le $WWNETRETRY ]; do @@ -174,40 +198,7 @@ ifup() { msg_gray "($IPADDR/$NETMASK)" wwsuccess - if [ -z "$WWNETCFGFILE" ]; then - msg_white "Creating network initialization files: " - msg_gray "($OSDEVICE)" - # DEB - echo "# This was created by the Warewulf bootstrap" > /tmp/interfaces - echo "auto lo" >> /tmp/interfaces - echo "iface lo inet loopback" >> /tmp/interfaces - echo '' >> /tmp/interfaces - echo "auto $OSDEVICE" >> /tmp/interfaces - echo "iface $OSDEVICE inet static" >> /tmp/interfaces - echo " address $WWIPADDR" >> /tmp/interfaces - echo " netmask $WWNETMASK" >> /tmp/interfaces - if [ -n "$WWGATEWAY" ]; then - echo " gateway $WWGATEWAY" >> /tmp/interfaces - fi - if [ -n "$HWADDR" ]; then - echo " hwaddress ether $HWADDR" >> /tmp/interfaces - fi - - # RHEL - echo "# This was created by the Warewulf bootstrap" > /tmp/ifcfg-$OSDEVICE - echo "DEVICE=$OSDEVICE" >> /tmp/ifcfg-$OSDEVICE - echo "BOOTPROTO=static" >> /tmp/ifcfg-$OSDEVICE - echo "ONBOOT=yes" >> /tmp/ifcfg-$OSDEVICE - echo "IPADDR=$IPADDR" >> /tmp/ifcfg-$OSDEVICE - echo "NETMASK=$NETMASK" >> /tmp/ifcfg-$OSDEVICE - echo "GATEWAY=$GATEWAY" >> /tmp/ifcfg-$OSDEVICE - echo "HWADDR=$HWADDR" >> /tmp/ifcfg-$OSDEVICE - fi - - if [ -n "$WWMTU" ]; then - echo "MTU=$WWMTU" >> /tmp/ifcfg-$OSDEVICE # RHEL - echo " mtu $WWMTU" >> /tmp/interfaces # DEB - fi + netconf_distro return 0 fi msg_white "." ++++++ initramfs-Going-forward-bin-or-sbin-are-mere-links-to-usr-cater-for-this.patch ++++++ From: Egbert Eich <[email protected]> Date: Sat Oct 9 10:50:49 2021 +0200 Subject: initramfs: Going forward, /bin or /sbin are mere links to /usr - cater for this Patch-mainline: Not yet Git-commit: 80dd992c331f88ab92a7c3591f0811a55a003b47 References: If the busybox installation hasn't installed symlinks in /[s]bin if the initfs copy all busybox links from /usr/[s]bin. Make sure there is a busybox binary (or link) under /bin. Signed-off-by: Egbert Eich <[email protected]> --- provision/initramfs/Makefile.am | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/provision/initramfs/Makefile.am b/provision/initramfs/Makefile.am index cc032d4..262b971 100644 --- a/provision/initramfs/Makefile.am +++ b/provision/initramfs/Makefile.am @@ -132,6 +132,17 @@ rootfs: busybox e2fsprogs libarchive parted else \ cp -av _work/$(BUSYBOX_DIR)/_install/* rootfs/ ;\ fi + if [ ! -L rootfs/bin/sh ]; then \ + for i in `find rootfs/usr/bin -type l -a -lname "*busybox"`; do \ + cp -av $$i rootfs/bin; \ + done; \ + for i in `find rootfs/usr/sbin -type l -a -lname "*busybox"`; do \ + cp -av $$i rootfs/sbin; \ + done; \ + if [ ! -e rootfs/bin/busybox -o -L rootfs/bin/busybox ]; then \ + test -e rootfs/usr/bin/busybox && ln -s /usr/bin/busybox rootfs/bin; \ + fi; \ + fi if [ -n "@local_e2fsprogs_path@" -a -f "@local_e2fsprogs_path@" ]; then \ cp -av "@local_e2fsprogs_path@" rootfs/sbin/mkfs.ext4 ;\ else \ ++++++ initramfs-Handle-NTP-client-configuration-for-SUSE.patch ++++++ From: Egbert Eich <[email protected]> Date: Mon Oct 11 07:33:15 2021 +0200 Subject: initramfs: Handle NTP client configuration for SUSE Patch-mainline: Not yet Git-commit: e3a259240ffed475ff3f8442ffdc81f517427f24 References: Signed-off-by: Egbert Eich <[email protected]> --- vnfs/libexec/wwmkchroot/functions | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/vnfs/libexec/wwmkchroot/functions b/vnfs/libexec/wwmkchroot/functions index fe3028f..b729cdb 100644 --- a/vnfs/libexec/wwmkchroot/functions +++ b/vnfs/libexec/wwmkchroot/functions @@ -219,22 +219,27 @@ configure_timezone() { } configure_ntp() { - NETDEV=`grep "^network device =" $WAREWULF_SYSCONFDIR/warewulf/provision.conf | cut -d = -f 2` + NETDEV=`sed -ne "/network device =/s/.*=\s*//p" $WAREWULF_SYSCONFDIR/warewulf/provision.conf` + IPADDR="" + BOOTPROTO="" if [ -f "/etc/sysconfig/network-scripts/ifcfg-$NETDEV" ]; then . /etc/sysconfig/network-scripts/ifcfg-$NETDEV - if [ -n "$IPADDR" -a "x$BOOTPROTO" == "xstatic" ]; then - echo "# Written by Warewulf:wwmkchroot" >> $CHROOTDIR/etc/ntp.conf - echo "driftfile /var/lib/ntp/drift" >> $CHROOTDIR/etc/ntp.conf + elif [ -f "/etc/sysconfig/network/ifcfg-$NETDEV" ]; then + . /etc/sysconfig/network/ifcfg-$NETDEV + fi + if [ -n "$IPADDR" -a "x$BOOTPROTO" == "xstatic" ]; then + IPADDR=${IPADDR/\/*/} + echo "# Written by Warewulf:wwmkchroot" >> $CHROOTDIR/etc/ntp.conf + echo "driftfile /var/lib/ntp/drift" >> $CHROOTDIR/etc/ntp.conf - echo "restrict default kod nomodify notrap nopeer noquery" >> $CHROOTDIR/etc/ntp.conf - echo "restrict -6 default kod nomodify notrap nopeer noquery" >> $CHROOTDIR/etc/ntp.conf + echo "restrict default kod nomodify notrap nopeer noquery" >> $CHROOTDIR/etc/ntp.conf + echo "restrict -6 default kod nomodify notrap nopeer noquery" >> $CHROOTDIR/etc/ntp.conf - echo "restrict 127.0.0.1" >> $CHROOTDIR/etc/ntp.conf - echo "restrict -6 ::1" >> $CHROOTDIR/etc/ntp.conf + echo "restrict 127.0.0.1" >> $CHROOTDIR/etc/ntp.conf + echo "restrict -6 ::1" >> $CHROOTDIR/etc/ntp.conf - echo "server $IPADDR prefer" >> $CHROOTDIR/etc/ntp.conf - echo "restrict $IPADDR mask 255.255.255.255 nomodify notrap noquery" >> $CHROOTDIR/etc/ntp.conf - fi + echo "server $IPADDR prefer" >> $CHROOTDIR/etc/ntp.conf + echo "restrict $IPADDR mask 255.255.255.255 nomodify notrap noquery" >> $CHROOTDIR/etc/ntp.conf fi return 0 } ++++++ vnfs-Do-not-pull-in-recommended-packages-on-SUSE.patch ++++++ From: Egbert Eich <[email protected]> Date: Fri Oct 15 23:14:50 2021 +0200 Subject: vnfs: Do not pull in recommended packages on SUSE Patch-mainline: Not yet Git-commit: b68ccd15c87aef87c2880ad9224110b13149e0a8 References: With recommended packages too many undesired packages will be pulled in. Signed-off-by: Egbert Eich <[email protected]> --- vnfs/libexec/wwmkchroot/include-suse | 4 ++-- vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl | 3 ++- vnfs/libexec/wwmkchroot/opensuse-tumbleweed.tmpl | 3 ++- vnfs/libexec/wwmkchroot/sle-15.tmpl | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/vnfs/libexec/wwmkchroot/include-suse b/vnfs/libexec/wwmkchroot/include-suse index af7dd36..e6cad4c 100644 --- a/vnfs/libexec/wwmkchroot/include-suse +++ b/vnfs/libexec/wwmkchroot/include-suse @@ -26,7 +26,7 @@ set_overlay() { echo "ERROR: This must be a SuSE compatible chroot!" return 1 fi - PKGR_CMD="$ZYP_CMD install --auto-agree-with-licenses $PKGLIST" + PKGR_CMD="$ZYP_CMD install --no-recommends --auto-agree-with-licenses $PKGLIST" return 0 } @@ -84,7 +84,7 @@ prechroot() { done fi - PKGR_CMD="$ZYP_CMD install --auto-agree-with-licenses $PKGLIST" + PKGR_CMD="$ZYP_CMD install --no-recommends --auto-agree-with-licenses $PKGLIST" return 0 } diff --git a/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl b/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl index 4f8c96f..9eb6871 100644 --- a/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl +++ b/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl @@ -13,7 +13,8 @@ PKGLIST="systemd-sysvinit aaa_base bash dracut distribution-release coreutils \ e2fsprogs ethtool filesystem findutils gawk grep iproute2 iputils \ mingetty net-tools nfs-kernel-server pam rpcbind procps psmisc shadow \ rsync sed rsyslog tcpd timezone util-linux tar less gzip kmod-compat \ - udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget zypper" + udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget + zypper netcfg ncurses-utils" diff --git a/vnfs/libexec/wwmkchroot/opensuse-tumbleweed.tmpl b/vnfs/libexec/wwmkchroot/opensuse-tumbleweed.tmpl index 6f973a2..e5ce50e 100644 --- a/vnfs/libexec/wwmkchroot/opensuse-tumbleweed.tmpl +++ b/vnfs/libexec/wwmkchroot/opensuse-tumbleweed.tmpl @@ -12,7 +12,8 @@ PKGLIST="systemd-sysvinit aaa_base bash dracut openSUSE-release coreutils \ e2fsprogs ethtool filesystem findutils gawk grep iproute2 iputils \ mingetty net-tools nfs-kernel-server pam rpcbind procps psmisc shadow \ rsync sed rsyslog tcpd timezone util-linux tar less gzip kmod-compat \ - udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget zypper" + udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget + zypper netcfg ncurses-utils glibc-locale-base" diff --git a/vnfs/libexec/wwmkchroot/sle-15.tmpl b/vnfs/libexec/wwmkchroot/sle-15.tmpl index fe46b99..34f5c86 100644 --- a/vnfs/libexec/wwmkchroot/sle-15.tmpl +++ b/vnfs/libexec/wwmkchroot/sle-15.tmpl @@ -10,7 +10,8 @@ PKGLIST="systemd-sysvinit aaa_base bash dracut distribution-release coreutils \ e2fsprogs ethtool filesystem findutils gawk grep iproute2 iputils \ mingetty net-tools nfs-kernel-server pam rpcbind procps psmisc shadow \ rsync sed rsyslog tcpd timezone util-linux tar less gzip kmod-compat \ - udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget zypper" + udev openssh dhcp-client pciutils vim strace cron cpupower cpio wget + zypper netcfg ncurses-utils"
