aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Kohler <bkohler@gentoo.org>2018-07-13 12:15:55 -0500
committerBen Kohler <bkohler@gentoo.org>2018-07-13 12:15:55 -0500
commit89d7daf0b43797924fd92d649edf5656343cfcfc (patch)
treeeac1be36ea9ba08f648c658577bd0a174eb21179 /releases/weekly/specs/x86
parentspecs: add binutils to livecd/unmerge on remaining arches (diff)
downloadreleng-89d7daf0b43797924fd92d649edf5656343cfcfc.tar.gz
releng-89d7daf0b43797924fd92d649edf5656343cfcfc.tar.bz2
releng-89d7daf0b43797924fd92d649edf5656343cfcfc.zip
specs: add /boot to livecd/empty to work around bug 661084
Due to bug 661084, the /boot/System* and other wildcard matches in livecd/rm are not functional. This causes us to ship a duplicate copy of kernel/initramfs, wasting space. I've added /boot to livecd/empty to work around this for now. I only added this to specs where /boot/* things were already in livecd/rm.
Diffstat (limited to 'releases/weekly/specs/x86')
-rw-r--r--releases/weekly/specs/x86/hardened/admincd-stage2.spec1
-rw-r--r--releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec1
-rw-r--r--releases/weekly/specs/x86/installcd-stage2-minimal.spec1
3 files changed, 3 insertions, 0 deletions
diff --git a/releases/weekly/specs/x86/hardened/admincd-stage2.spec b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
index 7c1614ff..3aef9108 100644
--- a/releases/weekly/specs/x86/hardened/admincd-stage2.spec
+++ b/releases/weekly/specs/x86/hardened/admincd-stage2.spec
@@ -121,6 +121,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
index afa190e6..3debe89c 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage2-minimal.spec
@@ -128,6 +128,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index d57ac1b0..13976bd3 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -122,6 +122,7 @@ livecd/unmerge:
sys-kernel/linux-headers
livecd/empty:
+ /boot
/etc/cron.daily
/etc/cron.hourly
/etc/cron.monthly