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-11 15:31:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/warewulf (Old)
 and      /work/SRC/openSUSE:Factory/.warewulf.new.2443 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "warewulf"

Mon Oct 11 15:31:58 2021 rev:3 rq:924400 version:3.8.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/warewulf/warewulf.changes        2020-05-09 
22:19:18.143622664 +0200
+++ /work/SRC/openSUSE:Factory/.warewulf.new.2443/warewulf.changes      
2021-10-11 15:32:59.894977810 +0200
@@ -1,0 +2,31 @@
+Mon Oct  4 18:08:59 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Fix minor issues:
+  * vnfs-SUSE-Templates-Leap-15.1-Leap-15.3-added-SLE-15.patch
+    Add templates for Leap 15.3 and SLE 15 (all SPs).
+  * common-Check-for-non-empty-string-before-chomp.patch
+    Avoid Perl error message by checking for non-empty string
+    before chomp().
+  * common-Create-database-user-separately-to-allow-empty-password.patch
+    Allow empty password for read only user database access.
+  * common-Fix-help-text.patch
+  * cluster-Don-t-attempt-ntp-configuration-when-chrony-is-found.patch
+    Do not attempt to configure ntp when chrony is found.
+  * 
cluster-If-hostname-doesn-t-contain-the-domain-try-to-derive-this-from-FQDN.patch
+    Attempt to derive hostname from FQDN.
+  * Set apache2moddir correctly
+  * Set warewulf group in perl-warewulf-common, not warewulf-common:
+    perl-warewulf-common is installed earlier.
+  * Unify handling of initramfs location
+    provision-Unify-handling-of-initramfs-location.patch
+  * Cater for /bin and /sbin only being links to /usr/bin and /usr/sbin
+    initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch
+- Removed:
+  * vnfs-wwmkchroot-opensuse-15.0.tmpl
+
+-------------------------------------------------------------------
+Fri Oct  1 07:00:20 UTC 2021 - Egbert Eich <e...@suse.com>
+
+- Utilize sysuser infrastructure to set group warewulf.
+
+-------------------------------------------------------------------

Old:
----
  vnfs-wwmkchroot-opensuse-15.0.tmpl

New:
----
  cluster-Don-t-attempt-ntp-configuration-when-chrony-is-found.patch
  
cluster-If-hostname-doesn-t-contain-the-domain-try-to-derive-this-from-FQDN.patch
  common-Check-for-non-empty-string-before-chomp.patch
  common-Create-database-user-separately-to-allow-empty-password.patch
  common-Fix-help-text.patch
  initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch
  provision-Unify-handling-of-initramfs-location.patch
  vnfs-SUSE-Templates-Leap-15.1-Leap-15.3-added-SLE-15.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ warewulf.spec ++++++
--- /var/tmp/diff_new_pack.I3YgFU/_old  2021-10-11 15:33:00.670979054 +0200
+++ /var/tmp/diff_new_pack.I3YgFU/_new  2021-10-11 15:33:00.674979061 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package warewulf
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -38,7 +38,6 @@
 Source1:        busybox.SuSE.config
 Source100:      install-recipe.md
 Source101:      install-recipe-vm.md
-Source300:      vnfs-wwmkchroot-opensuse-15.0.tmpl
 Source301:      vnfs-wwmkchroot-opensuse-42.3.tmpl
 Source302:      vnfs-wwmkchroot-opensuse-tumbleweed.tmpl
 Patch0:         wwinit-Check-if-service-is-enabled-before-enabling-it.patch
@@ -73,6 +72,14 @@
 Patch28:        cluster-remove-firstboot-stuff.patch
 Patch29:        
LSB-Use-sharedstatedir-instead-of-localstatedir-for-WW_STATEDIR.patch
 Patch30:        common-Check-for-package-mariadb-as-well.patch
+Patch31:        vnfs-SUSE-Templates-Leap-15.1-Leap-15.3-added-SLE-15.patch
+Patch32:        common-Check-for-non-empty-string-before-chomp.patch
+Patch33:        
common-Create-database-user-separately-to-allow-empty-password.patch
+Patch34:        common-Fix-help-text.patch
+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
 
 %if "%{?flavor}" != "common"
 BuildRequires:  bsdtar
@@ -90,12 +97,15 @@
 BuildRequires:  warewulf-common
 BuildRequires:  xz-devel
 BuildRequires:  perl(Apache)
-BuildRequires:  perl(Apache)
 %endif
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  distribution-release
 BuildRequires:  fdupes
+BuildRequires:  sysuser-tools
+# NOTYET
+#BuildRequires: xfsprogs
+#BuildRequires: curl
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -372,6 +382,8 @@
 %patch8 -p1
 %patch13 -p1
 %patch14 -p1
+%patch37 -p1
+%patch38 -p1
 # IPXE sources not needed
 #%patch17 -p1
 %patch23 -p1
@@ -385,6 +397,7 @@
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch31 -p1
 # cluster
 %patch2 -p1
 %patch3 -p1
@@ -392,10 +405,15 @@
 %patch11 -p1
 %patch22 -p1
 %patch28 -p1
+%patch35 -p1
+%patch36 -p1
 # ipmi
 %patch25 -p1
 # common
 %patch18 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
 
 %build
 %if "%{?flavor}" == "common"
@@ -431,11 +449,13 @@
 
 cd provision
 autoreconf -f -i
+busybox_links=%_datadir/busybox/busybox-static.links
+test -e $busybox_links || busybox_links=%_datadir/busybox/busybox.links
 %if 0%{?full_build}
 %configure \
     --enable-cross-compile \
     --with-local-busybox=%_bindir/busybox-static \
-    --with-busybox-links-file=%_datadir/busybox/busybox.links \
+    --with-busybox-links-file=$busybox_links \
     --with-local-e2fsprogs=%_prefix/sbin/mkfs.ext4 \
     --with-local-ipxe_undionly=%_datadir/ipxe/undionly.kpxe \
     --with-local-ipxe_snp_i386=%_datadir/ipxe/snp-i386.efi \
@@ -444,15 +464,16 @@
     --with-local-libarchive=%_bindir/bsdtar \
     --with-local-parted=%_prefix/sbin/parted \
     --with-local-partprobe=%_prefix/sbin/partprobe \
-    --with-apache2moddir=%_prefix/apache2/conf.d/
+    --with-apache2moddir=%_libdir/apache2
 %else
 %configure \
     --with-local-busybox=%_bindir/busybox-static \
-    --with-busybox-links-file=%_datadir/busybox/busybox.links \
+    --with-busybox-links-file=$busybox_links \
     --with-local-e2fsprogs=%_prefix/sbin/mkfs.ext4 \
     --with-local-libarchive=%_bindir/bsdtar \
     --with-local-parted=%_prefix/sbin/parted \
     --with-local-partprobe=%_prefix/sbin/partprobe
+#NOTYET   --with-local-xfsprogs=/sbin/mkfs.xfs, 
--with-local-curl=%{bindir}/curl
 cd initramfs
 %endif
 make
@@ -468,6 +489,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
 
 %else
 
@@ -479,7 +503,6 @@
 done
 
 # vnfs
-install %{SOURCE300} 
%{buildroot}/%{_libexecdir}/warewulf/wwmkchroot/opensuse-15.0.tmpl
 install %{SOURCE301} 
%{buildroot}/%{_libexecdir}/warewulf/wwmkchroot/opensuse-42.3.tmpl
 install %{SOURCE302} 
%{buildroot}/%{_libexecdir}/warewulf/wwmkchroot/opensuse-tumbleweed.tmpl
 
@@ -511,17 +534,16 @@
 %endif
 %fdupes -s %{buildroot}
 
-%pre common
-getent group warewulf >/dev/null || groupadd -r warewulf
-
 %post common
 if [ $1 -eq 2 ] ; then
     %{_bindir}/wwsh object canonicalize -t node >/dev/null 2>&1 || :
     %{_bindir}/wwsh object canonicalize -t file >/dev/null 2>&1 || :
 fi
 
-systemctl start mariadb >/dev/null 2>&1 || :
-systemctl enable mariadb >/dev/null 2>&1 || :
+%pre -n perl-warewulf-common -f %{name}.pre
+
+%pre common
+systemctl enable --now mariadb >/dev/null 2>&1 || :
 
 %if "%{?flavor}" == "common"
 %files common
@@ -551,6 +573,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
 
 %files doc
 %defattr(-, root, root)
@@ -647,7 +670,7 @@
 %{_libexecdir}/warewulf/wwmkchroot/include-rhel
 %{_libexecdir}/warewulf/wwmkchroot/include-suse
 %{_libexecdir}/warewulf/wwmkchroot/include-ubuntu
-%{_libexecdir}/warewulf/wwmkchroot/opensuse-15.0.tmpl
+%{_libexecdir}/warewulf/wwmkchroot/opensuse-15.3.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/opensuse-42.3.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/opensuse-tumbleweed.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/rhel-generic.tmpl
@@ -656,6 +679,7 @@
 %{_libexecdir}/warewulf/wwmkchroot/sl-7.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/sles-11.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/sles-12.tmpl
+%{_libexecdir}/warewulf/wwmkchroot/sle-15.tmpl
 %{_libexecdir}/warewulf/wwmkchroot/ubuntu-16.04.tmpl
 %{_mandir}/man1/wwbootstrap.1.gz
 %{_mandir}/man1/wwvnfs.1.gz


++++++ cluster-Don-t-attempt-ntp-configuration-when-chrony-is-found.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Mon Oct 4 19:48:08 2021 +0200
Subject: cluster: Don't attempt ntp configuration when chrony is found
Patch-mainline: Not yet
Git-commit: 9d9f44ba334a70a4daa24540596b0a1e5d354530
References: 

Signed-off-by: Egbert Eich <e...@suse.com>
---
 cluster/libexec/wwinit/50-ntpd.init | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cluster/libexec/wwinit/50-ntpd.init 
b/cluster/libexec/wwinit/50-ntpd.init
old mode 100644
new mode 100755
index ae6582d..5e09771
--- a/cluster/libexec/wwinit/50-ntpd.init
+++ b/cluster/libexec/wwinit/50-ntpd.init
@@ -20,9 +20,13 @@ fi
 
 wwreqroot
 
+if [ -f "/etc/chrony.conf" ]; then
+    wwprint "Using chrony; skipping ntp configuration\n"
+    exit 0
+fi
 if [ ! -f "/etc/ntp.conf" ]; then
     wwprint "Is NTP installed? /etc/ntp.conf is not present!\n" error
-    return 1
+    exit 1
 fi
 
 
++++++ 
cluster-If-hostname-doesn-t-contain-the-domain-try-to-derive-this-from-FQDN.patch
 ++++++
From: Egbert Eich <e...@suse.com>
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
References: 

SUSE doesn't include the domainname in the hostname. One may still
set the domain name using DNS or /etc/hosts.
Call 'hostname -f' to get the FQDN and try to separate the domain
part from it.

Signed-off-by: Egbert Eich <e...@suse.com>
---
 cluster/libexec/wwinit/30-domain.init | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/cluster/libexec/wwinit/30-domain.init 
b/cluster/libexec/wwinit/30-domain.init
index ac221a5..08846c0 100644
--- a/cluster/libexec/wwinit/30-domain.init
+++ b/cluster/libexec/wwinit/30-domain.init
@@ -34,7 +34,11 @@ HOSTNAME=`hostname`
 DOMAIN=`echo $HOSTNAME | sed -e 's/^[^\.]*\.//'`
 
 if [ -z "$DOMAIN" -o "$HOSTNAME" == "$DOMAIN" ]; then
-    DOMAIN="cluster"
+    HOSTNAME=`hostname -f`
+    DOMAIN=`echo $HOSTNAME | sed -e 's/^[^\.]*\.//'`
+    if [ -z "$DOMAIN" -o "$HOSTNAME" == "$DOMAIN" ]; then
+       DOMAIN="cluster"
+    fi
 fi
 
 wwprint "Setting default node domain to: \"$DOMAIN\""
++++++ common-Check-for-non-empty-string-before-chomp.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Mon Oct 4 19:56:06 2021 +0200
Subject: common: Check for non-empty string before chomp()
Patch-mainline: Not yet
Git-commit: 095b0b5452183654517c30e231912af82baf0c9d
References: 

Signed-off-by: Egbert Eich <e...@suse.com>
---
 common/lib/Warewulf/System/Suse.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/common/lib/Warewulf/System/Suse.pm 
b/common/lib/Warewulf/System/Suse.pm
index 155547c..78e4075 100644
--- a/common/lib/Warewulf/System/Suse.pm
+++ b/common/lib/Warewulf/System/Suse.pm
@@ -80,7 +80,9 @@ service($$$)
         while(<SERVICE>) {
             $self->{"OUTPUT"} .= $_;
         }
-        chomp($self->{"OUTPUT"});
+       if (defined($self->{"OUTPUT"})) {
+           chomp($self->{"OUTPUT"});
+       }
         if (close SERVICE) {
             &dprint("Service command ran successfully\n");
             return(1);
++++++ common-Create-database-user-separately-to-allow-empty-password.patch 
++++++
From: Egbert Eich <e...@suse.com>
Date: Mon Oct 4 19:49:16 2021 +0200
Subject: common: Create database user separately to allow empty password
Patch-mainline: Not yet
Git-commit: 3e87929be4b49584a9a3d5c51ef5eb2dc2d1792a
References: 

Signed-off-by: Egbert Eich <e...@suse.com>
---
 common/libexec/wwinit/10-database.init | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/common/libexec/wwinit/10-database.init 
b/common/libexec/wwinit/10-database.init
index 5d0626b..c58c5c0 100644
--- a/common/libexec/wwinit/10-database.init
+++ b/common/libexec/wwinit/10-database.init
@@ -183,10 +183,14 @@ if [ "$DATASTORE" = "mysql" ]; then
     fi 
 
     if [ -n "$DBUSER" ] && [ "$DBUSER" != "root" ]; then
-        wwprint "Updating database permissions for base user"
+        wwprint "Creating base user if it doesn't exist"
         wwrun mysql $CLI_ARGS $DBNAME <<- END_OF_SQL
-            GRANT SELECT on $DBNAME.* 
-                TO '$DBUSER'@'$DBCLIENT' IDENTIFIED BY '$DBPASS'
+            CREATE USER if not exists '$DBUSER'@'$DBCLIENT';
+       END_OF_SQL
+       wwprint "Updating database permissions for base user"
+       wwrun mysql $CLI_ARGS $DBNAME <<- END_OF_SQL
+           GRANT SELECT on $DBNAME.*
+               TO '$DBUSER'@'$DBCLIENT' IDENTIFIED BY '$DBPASS'
        END_OF_SQL
     fi
 
++++++ common-Fix-help-text.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Mon Oct 4 19:48:26 2021 +0200
Subject: common: Fix help text
Patch-mainline: Not yet
Git-commit: 1a1e9ccc7fc19fac49eda100d83bfdb82be2b7fb
References: 

Signed-off-by: Egbert Eich <e...@suse.com>
---
 common/bin/wwconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/bin/wwconfig b/common/bin/wwconfig
index 58e98fa..34ab765 100755
--- a/common/bin/wwconfig
+++ b/common/bin/wwconfig
@@ -39,7 +39,7 @@ if ($opt_help) {
     print "\n";
     print "   Options:\n";
     print "      -h, --help     Show this help summary\n";
-    print "      -a, --all      Print all evnironment variables\n";
+    print "      -a, --all      Print all environment variables\n";
     print "      -s, --sh       Print output in Bourne shell format\n";
     print "      -e, --exp      Also print out export lines. For use with 
Bourne shell format.\n";
     print "      -c, --csh      Print output in C shell format\n";
++++++ initramfs-Them-kewl-kids-no-longer-like-bin-or-sbin-cater-for-them.patch 
++++++
From: Egbert Eich <e...@suse.com>
Date: Sat Oct 9 10:50:49 2021 +0200
Subject: initramfs: Them 'kewl' kids no longer like /bin or /sbin - cater for 
them
Patch-mainline: Not yet
Git-commit: 940464e684aac87bea21bf6c9d73ed13453584ac
References: 

Create relative links to help installation, replace by absolute links
before creating the image.

Signed-off-by: Egbert Eich <e...@suse.com>
---
 provision/initramfs/Makefile.am | 6 ++++++
 1 file changed, 6 insertions(+)
diff --git a/provision/initramfs/Makefile.am b/provision/initramfs/Makefile.am
index cc032d4..bf03405 100644
--- a/provision/initramfs/Makefile.am
+++ b/provision/initramfs/Makefile.am
@@ -119,6 +119,8 @@ rootfs: busybox e2fsprogs libarchive parted
        mkdir rootfs/usr
        mkdir rootfs/lib
        mkdir rootfs/lib64
+       ln -s ../bin rootfs/usr/bin
+       ln -s ../sbin rootfs/usr/sbin
        chmod -R u+w rootfs/
        if [ -n "@local_busybox_path@" -a -f "@local_busybox_path@" -a \
            -n "@local_busybox_path@" -a -f "@busybox_links_path@" ]; then \
@@ -169,6 +171,10 @@ rootfs: busybox e2fsprogs libarchive parted
        ln -s transporthandler rootfs/sbin/wwgetscript
        ln -s transporthandler rootfs/sbin/wwgetnodeconfig
        ln -s transporthandler rootfs/sbin/wwgetfiles
+       rm -f rootfs/usr/bin
+       ln -s /bin rootfs/usr/bin
+       rm -f rootfs/usr/sbin
+       ln -s /sbin rootfs/usr/sbin
 
 initramfs.cpio: rootfs
        install -m 644 $(srcdir)/devs.cpio initramfs.cpio
++++++ provision-Unify-handling-of-initramfs-location.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Wed Oct 6 14:30:12 2021 +0200
Subject: provision: Unify handling of initramfs location
Patch-mainline: Not yet
Git-commit: 6884063cbbafab0e166ae4375f9ad608dbedd933
References: 

warewulf/ipmi derives the initramfs location from
WW_STATEDIR which is set in warewulf/common.

Signed-off-by: Egbert Eich <e...@suse.com>
Signed-off-by: Egbert Eich <e...@suse.de>
---
 provision/configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/provision/configure.ac b/provision/configure.ac
index 4ee0c64..8deb735 100644
--- a/provision/configure.ac
+++ b/provision/configure.ac
@@ -161,7 +161,7 @@ AC_SUBST(fulllocalstatedir)
 AC_EXPAND_DIR(fulldatadir, "$datadir")
 AC_SUBST(fulldatadir)
 
-initramfsdir="$localstatedir/warewulf/initramfs/";
+initramfsdir="$WAREWULFSTATEDIR/warewulf/initramfs/";
 AC_SUBST(initramfsdir)
 
 BUSYBOX_CONFIG_EXTRA_LDLIBS=
++++++ vnfs-SUSE-Templates-Leap-15.1-Leap-15.3-added-SLE-15.patch ++++++
From: Egbert Eich <e...@suse.com>
Date: Mon Oct 4 19:59:38 2021 +0200
Subject: vnfs: SUSE Templates - Leap 15.1 -> Leap 15.3, added SLE-15
Patch-mainline: Not yet
Git-commit: abf97eb1996a3bd2477efb0237000042fc6462e0
References: 

- Change Leap 15.1 template to Leap 15.3.
- Change openSUSE-release -> distrobution-release
- Add SLE-15 template (valid for all service packs).
  Leave ZYPP_MIRROR empty, this will retrieve the zypper data
  from the currently installed product.

Signed-off-by: Egbert Eich <e...@suse.com>
---
 vnfs/libexec/wwmkchroot/Makefile.am                    |  2 +-
 .../{opensuse-15.0.tmpl => opensuse-15.3.tmpl}         |  8 ++++----
 vnfs/libexec/wwmkchroot/sle-15.tmpl                    | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/vnfs/libexec/wwmkchroot/Makefile.am 
b/vnfs/libexec/wwmkchroot/Makefile.am
index 99bfe9b..2246a52 100644
--- a/vnfs/libexec/wwmkchroot/Makefile.am
+++ b/vnfs/libexec/wwmkchroot/Makefile.am
@@ -1,6 +1,6 @@
 wwmkchrootdir = $(libexecdir)/warewulf/wwmkchroot
 
-dist_wwmkchroot_SCRIPTS = centos-5.tmpl centos-6.tmpl centos-7.tmpl 
include-rhel rhel-generic.tmpl sl-5.tmpl sl-6.tmpl sl-7.tmpl functions 
include-deb debian-8.tmpl debian7-32.tmpl debian7-64.tmpl golden-system.tmpl 
include-suse opensuse-42.3.tmpl opensuse-15.0.tmpl opensuse-tumbleweed.tmpl 
sles-11.tmpl sles-12.tmpl include-ubuntu ubuntu-16.04.tmpl
+dist_wwmkchroot_SCRIPTS = centos-5.tmpl centos-6.tmpl centos-7.tmpl 
include-rhel rhel-generic.tmpl sl-5.tmpl sl-6.tmpl sl-7.tmpl functions 
include-deb debian-8.tmpl debian7-32.tmpl debian7-64.tmpl golden-system.tmpl 
include-suse opensuse-42.3.tmpl opensuse-15.3.tmpl opensuse-tumbleweed.tmpl 
sles-11.tmpl sles-12.tmpl sle-15.tmpl include-ubuntu ubuntu-16.04.tmpl
  
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/vnfs/libexec/wwmkchroot/opensuse-15.0.tmpl 
b/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl
similarity index 71%
rename from vnfs/libexec/wwmkchroot/opensuse-15.0.tmpl
rename to vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl
index db0f43e..4f8c96f 100644
--- a/vnfs/libexec/wwmkchroot/opensuse-15.0.tmpl
+++ b/vnfs/libexec/wwmkchroot/opensuse-15.3.tmpl
@@ -4,12 +4,12 @@
 
 
 
-# Define the location of the YUM repository
-ZYP_MIRROR="http://download.opensuse.org/distribution/leap/15.0/repo/oss/,\
-http://download.opensuse.org/update/leap/15.0/oss/";
+# Define the location of the zypper repository
+ZYP_MIRROR="http://download.opensuse.org/distribution/leap/15.3/repo/oss/,\
+http://download.opensuse.org/update/leap/15.3/oss/";
 
 # Install only what is necessary/specific for this distribution
-PKGLIST="systemd-sysvinit aaa_base bash dracut openSUSE-release coreutils \
+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 \
diff --git a/vnfs/libexec/wwmkchroot/sle-15.tmpl 
b/vnfs/libexec/wwmkchroot/sle-15.tmpl
new file mode 100644
index 0000000..fe46b99
--- /dev/null
+++ b/vnfs/libexec/wwmkchroot/sle-15.tmpl
@@ -0,0 +1,18 @@
+# The general SUSE include has all of the necessary functions, but requires
+# some basic variables specific to each chroot type to be defined.
+. include-suse
+
+
+ZYP_MIRROR=
+
+# Install only what is necessary/specific for this distribution
+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"
+
+
+
+
+# vim:filetype=sh:syntax=sh:expandtab:ts=4:sw=4:

Reply via email to