From 2559d28cb4fb891c6050b277c73d1923cc227aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=E1=B4=8F=C9=B4=C9=A2=20Jie?= <gongjie@linux.vnet.ibm.com>
Date: Tue, 26 Jun 2018 13:06:52 +0800
Subject: [PATCH] Revise Ubuntu 18.04 package list, add ifupdown, remove ntp
 and ntpdate (#5324)

---
 .../xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist    | 3 +--
 .../xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist    | 3 +--
 .../xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist     | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
index a2a01bc6e..80a145e6a 100644
--- a/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/install/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
@@ -1,4 +1,5 @@
 bash
+ifupdown
 nfs-common
 openssl
 isc-dhcp-client
@@ -7,8 +8,6 @@ openssh-server
 openssh-client
 wget
 vim
-ntp
-ntpdate
 rsync
 busybox-static
 gawk
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
index df556b887..583d62ad1 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.ppc64el.pkglist
@@ -1,4 +1,5 @@
 bash
+ifupdown
 nfs-common
 openssl
 isc-dhcp-client
@@ -8,8 +9,6 @@ openssh-server
 openssh-client
 wget
 vim
-ntp
-ntpdate
 rsync
 busybox-static
 gawk
diff --git a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
index df556b887..583d62ad1 100644
--- a/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
+++ b/xCAT-server/share/xcat/netboot/ubuntu/compute.ubuntu18.04.x86_64.pkglist
@@ -1,4 +1,5 @@
 bash
+ifupdown
 nfs-common
 openssl
 isc-dhcp-client
@@ -8,8 +9,6 @@ openssh-server
 openssh-client
 wget
 vim
-ntp
-ntpdate
 rsync
 busybox-static
 gawk