From 4ee90d795db8ed83dd117f45c14fa4a7b4b6d2d5 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Mon, 1 Jan 2018 08:24:18 +0000 Subject: [PATCH] Add caps and filecaps use flags to the admin-cd. Drop sys-fs/nilfs-utils from the admin-cd - bug 591084. Add app-editors/nano to the packages list of the install-cd and the admin-cd so that it isn't depcleaned - bug 642856. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) --- .../weekly/specs/amd64/hardened/admincd-stage1-selinux.spec | 4 +++- releases/weekly/specs/amd64/hardened/admincd-stage1.spec | 4 +++- releases/weekly/specs/amd64/installcd-stage1.spec | 1 + releases/weekly/specs/x86/hardened/admincd-stage1.spec | 4 +++- releases/weekly/specs/x86/installcd-stage1.spec | 1 + 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec index 81032fed..e5920c50 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1-selinux.spec @@ -9,8 +9,10 @@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: + caps deprecated fbcon + filecaps ipv6 livecd loop-aes @@ -59,6 +61,7 @@ livecd/packages: app-editors/hexcurse app-editors/hexedit app-editors/mg + app-editors/nano app-editors/vim app-emacs/ebuild-mode app-emulation/xen-tools @@ -186,7 +189,6 @@ livecd/packages: sys-fs/mac-fdisk sys-fs/mdadm sys-fs/multipath-tools - sys-fs/nilfs-utils sys-fs/ntfs3g sys-fs/reiserfsprogs sys-fs/xfsprogs diff --git a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec index 45d0077a..f88dd449 100644 --- a/releases/weekly/specs/amd64/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/amd64/hardened/admincd-stage1.spec @@ -9,8 +9,10 @@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: + caps deprecated fbcon + filecaps ipv6 livecd loop-aes @@ -60,6 +62,7 @@ livecd/packages: app-editors/hexcurse app-editors/hexedit app-editors/mg + app-editors/nano app-editors/vim app-emacs/ebuild-mode app-emulation/cloud-init @@ -189,7 +192,6 @@ livecd/packages: sys-fs/mac-fdisk sys-fs/mdadm sys-fs/multipath-tools - sys-fs/nilfs-utils sys-fs/ntfs3g sys-fs/reiserfsprogs sys-fs/xfsprogs diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec index 5ee6c258..e9b24e29 100644 --- a/releases/weekly/specs/amd64/installcd-stage1.spec +++ b/releases/weekly/specs/amd64/installcd-stage1.spec @@ -37,6 +37,7 @@ livecd/packages: app-arch/unzip app-crypt/gnupg app-editors/mg + app-editors/nano app-misc/screen app-portage/mirrorselect app-text/wgetpaste diff --git a/releases/weekly/specs/x86/hardened/admincd-stage1.spec b/releases/weekly/specs/x86/hardened/admincd-stage1.spec index 3c37f663..563f6292 100644 --- a/releases/weekly/specs/x86/hardened/admincd-stage1.spec +++ b/releases/weekly/specs/x86/hardened/admincd-stage1.spec @@ -9,8 +9,10 @@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/weekly/portage/isos livecd/use: + caps deprecated fbcon + filecaps ipv6 livecd loop-aes @@ -60,6 +62,7 @@ livecd/packages: app-editors/hexcurse app-editors/hexedit app-editors/mg + app-editors/nano app-editors/vim app-emacs/ebuild-mode app-emulation/cloud-init @@ -189,7 +192,6 @@ livecd/packages: sys-fs/mac-fdisk sys-fs/mdadm sys-fs/multipath-tools - sys-fs/nilfs-utils sys-fs/ntfs3g sys-fs/reiserfsprogs sys-fs/xfsprogs diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec index 42a967ed..65a5d292 100644 --- a/releases/weekly/specs/x86/installcd-stage1.spec +++ b/releases/weekly/specs/x86/installcd-stage1.spec @@ -35,6 +35,7 @@ livecd/packages: app-arch/unzip app-crypt/gnupg app-editors/mg + app-editors/nano app-misc/screen app-portage/mirrorselect app-text/wgetpaste