From 36dd1d14db6854c47a7de350e9c9bea21d71ab26 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Wed, 15 Jan 2020 18:29:29 +0100 Subject: [PATCH 1/2] SLE15: Fix makenamed.conf --- xCAT-server/sbin/makenamed.conf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xCAT-server/sbin/makenamed.conf b/xCAT-server/sbin/makenamed.conf index 22e1fbbc6..66487f9d9 100755 --- a/xCAT-server/sbin/makenamed.conf +++ b/xCAT-server/sbin/makenamed.conf @@ -30,7 +30,10 @@ is_lsb_ubuntu () DIRECTORY=/var/named -if [ -f /etc/SuSE-release ]; then +# check for SLES +grep -s -q sles /etc/os-release +IS_SLES=$? +if [ -f /etc/SuSE-release ] || [ $IS_SLES -eq 0 ]; then DIRECTORY=/var/lib/named fi FILE=/etc/named.conf From e1379fe11e58f816f5c52e8feac7a6f360e46f31 Mon Sep 17 00:00:00 2001 From: Markus Hilger Date: Thu, 16 Jan 2020 11:15:43 +0100 Subject: [PATCH 2/2] Remove plymouth from SLE15 pkglist It causes issues during genimage (zypper RC 107) and is not needed anyways --- xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist | 2 -- .../share/xcat/netboot/sles/compute.sle15.x86_64.pkglist | 2 -- 2 files changed, 4 deletions(-) diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist index e54445878..d59b44159 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.pkglist @@ -28,7 +28,6 @@ binutils tar open-iscsi curl -plymouth btrfsprogs cryptsetup dmraid @@ -40,7 +39,6 @@ cifs-utils open-lldp fcoe-utils util-linux-systemd -plymouth-dracut udev kernel-default kernel-firmware diff --git a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist index e4b0ff54f..860b71366 100644 --- a/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist +++ b/xCAT-server/share/xcat/netboot/sles/compute.sle15.x86_64.pkglist @@ -28,7 +28,6 @@ binutils tar open-iscsi curl -plymouth btrfsprogs cryptsetup dmraid @@ -40,7 +39,6 @@ cifs-utils open-lldp fcoe-utils util-linux-systemd -plymouth-dracut udev kernel-default kernel-firmware