container/container-medium-19.ks | 4 -
container/container-medium-20.ks | 4 -
container/container-minimal-19.ks | 138 -----------------------------------
container/container-minimal-20.ks | 138 -----------------------------------
container/container-small-19.ks | 148 ++++++++++++++++++++++++++++++++++++++
container/container-small-20.ks | 148 ++++++++++++++++++++++++++++++++++++++
6 files changed, 298 insertions(+), 282 deletions(-)
New commits:
commit 4d6e862b034d0b400eb23ede28efdde8f18cbc20
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Tue Sep 24 19:55:22 2013 -0400
mv minimal to small, because minimal is KIND OF A LIE
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
deleted file mode 100644
index 4e19ded..0000000
--- a/container/container-minimal-19.ks
+++ /dev/null
@@ -1,148 +0,0 @@
-# This is a kickstart for making a non-bootable container environment.
-#
-# Convert the result to a tarfile with
-#
-# virt-tar-out -a fedora.qcow2 / - | bzip2 --best > fedora.tar.bz2
-#
-#
-# This kickstart file is designed to be used with appliance-creator and
-# may need slight modification for use with actual anaconda or other tools.
-# We intend to target anaconda-in-a-vm style image building for F20, but
-# not necessarily for containers -- that's yet to be worked out.
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-
-zerombr
-clearpart --all
-part / --size 1024 --fstype ext4
-
-# Repositories
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=$basearch
-repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=$basearch
-
-reboot
-
-# Package list.
-%packages --excludedocs
-
-bash
-coreutils
-fedora-release
-filesystem
-findutils
-grep
-iproute
-sed
-setup
-yum
-
-# removed below
-passwd
-# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
-firewalld
-
-%end
-
-
-
-%post --erroronfail
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# create devices which appliance-creator does not
-ln -s /proc/kcore /dev/core
-mknod -m 600 /dev/console c 5 1
-mknod -m 660 /dev/loop0 b 7 0
-mknod -m 660 /dev/loop1 b 7 1
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-
-echo "Compressing cracklib."
-gzip -9 /usr/share/cracklib/pw_dict.pwd
-
-echo "Minimizing locale-archive."
-localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
-mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-/usr/sbin/build-locale-archive
-# this is really kludgy and will be fixed with a better way of building
-# these containers
-mv /usr/share/locale/en /usr/share/locale/en_US /tmp
-rm -rf /usr/share/locale/*
-mv /tmp/en /tmp/en_US /usr/share/locale/
-mv /usr/share/i18n/locales/en_US /tmp
-rm -rf /usr/share/i18n/locales/*
-mv /tmp/en_US /usr/share/i18n/locales/
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
-
-echo "Removing extra packages."
-rm -vf /etc/yum/protected.d/*
-yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
-echo "Removing boot, since we don't need that."
-rm -rf /boot/*
-
-echo "Cleaning old yum repodata."
-yum clean all
-rm -rf /var/lib/yum/yumdb/*
-truncate -c -s 0 /var/log/yum.log
-
-echo "Fixing SELinux contexts."
-/usr/sbin/fixfiles -R -a restore
-
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
deleted file mode 100644
index 9266a0e..0000000
--- a/container/container-minimal-20.ks
+++ /dev/null
@@ -1,148 +0,0 @@
-# This is a kickstart for making a non-bootable container environment.
-#
-# Convert the result to a tarfile with
-#
-# virt-tar-out -a fedora.qcow2 / - | bzip2 --best > fedora.tar.bz2
-#
-#
-# This kickstart file is designed to be used with appliance-creator and
-# may need slight modification for use with actual anaconda or other tools.
-# We intend to target anaconda-in-a-vm style image building for F20, but
-# not necessarily for containers -- that's yet to be worked out.
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc Etc/UTC
-
-auth --useshadow --enablemd5
-selinux --enforcing
-rootpw --lock --iscrypted locked
-
-zerombr
-clearpart --all
-part / --size 1024 --fstype ext4
-
-# Repositories
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
-repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
-
-reboot
-
-# Package list.
-%packages --excludedocs
-
-bash
-coreutils
-fedora-release
-filesystem
-findutils
-grep
-iproute
-sed
-setup
-yum
-
-# removed below
-passwd
-# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
-firewalld
-
-%end
-
-
-
-%post --erroronfail
-
-# setup systemd to boot to the right runlevel
-echo -n "Setting default runlevel to multiuser text mode"
-rm -f /etc/systemd/system/default.target
-ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-echo .
-
-# create devices which appliance-creator does not
-ln -s /proc/kcore /dev/core
-mknod -m 600 /dev/console c 5 1
-mknod -m 660 /dev/loop0 b 7 0
-mknod -m 660 /dev/loop1 b 7 1
-
-echo -n "Network fixes"
-# initscripts don't like this file to be missing.
-cat > /etc/sysconfig/network << EOF
-NETWORKING=yes
-NOZEROCONF=yes
-EOF
-
-# For cloud images, 'eth0' _is_ the predictable device name, since
-# we don't want to be tied to specific virtual (!) hardware
-rm -f /etc/udev/rules.d/70*
-ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
-
-# simple eth0 config, again not hard-coded to the build hardware
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-EOF
-
-# generic localhost names
-cat > /etc/hosts << EOF
-127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
-::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
-
-EOF
-echo .
-
-
-# Because memory is scarce resource in most cloud/virt environments,
-# and because this impedes forensics, we are differing from the Fedora
-# default of having /tmp on tmpfs.
-echo "Disabling tmpfs for /tmp."
-systemctl mask tmp.mount
-
-echo "Removing random-seed so it's not the same in every image."
-rm -f /var/lib/random-seed
-
-
-echo "Compressing cracklib."
-gzip -9 /usr/share/cracklib/pw_dict.pwd
-
-echo "Minimizing locale-archive."
-localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
-mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-/usr/sbin/build-locale-archive
-# this is really kludgy and will be fixed with a better way of building
-# these containers
-mv /usr/share/locale/en /usr/share/locale/en_US /tmp
-rm -rf /usr/share/locale/*
-mv /tmp/en /tmp/en_US /usr/share/locale/
-mv /usr/share/i18n/locales/en_US /tmp
-rm -rf /usr/share/i18n/locales/*
-mv /tmp/en_US /usr/share/i18n/locales/
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
-
-echo "Removing extra packages."
-rm -vf /etc/yum/protected.d/*
-yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-
-echo "Removing boot, since we don't need that."
-rm -rf /boot/*
-
-echo "Cleaning old yum repodata."
-yum clean all
-rm -rf /var/lib/yum/yumdb/*
-truncate -c -s 0 /var/log/yum.log
-
-echo "Fixing SELinux contexts."
-/usr/sbin/fixfiles -R -a restore
-
-
-echo "Zeroing out empty space."
-# This forces the filesystem to reclaim space from deleted files
-dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
-rm -f /var/tmp/zeros
-echo "(Don't worry -- that out-of-space error was expected.)"
-
-%end
-
diff --git a/container/container-small-19.ks b/container/container-small-19.ks
new file mode 100644
index 0000000..4e19ded
--- /dev/null
+++ b/container/container-small-19.ks
@@ -0,0 +1,148 @@
+# This is a kickstart for making a non-bootable container environment.
+#
+# Convert the result to a tarfile with
+#
+# virt-tar-out -a fedora.qcow2 / - | bzip2 --best > fedora.tar.bz2
+#
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20, but
+# not necessarily for containers -- that's yet to be worked out.
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --enablemd5
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+zerombr
+clearpart --all
+part / --size 1024 --fstype ext4
+
+# Repositories
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-19&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f19&arch=$basearch
+
+reboot
+
+# Package list.
+%packages --excludedocs
+
+bash
+coreutils
+fedora-release
+filesystem
+findutils
+grep
+iproute
+sed
+setup
+yum
+
+# removed below
+passwd
+# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
+firewalld
+
+%end
+
+
+
+%post --erroronfail
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+# create devices which appliance-creator does not
+ln -s /proc/kcore /dev/core
+mknod -m 600 /dev/console c 5 1
+mknod -m 660 /dev/loop0 b 7 0
+mknod -m 660 /dev/loop1 b 7 1
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+
+echo "Compressing cracklib."
+gzip -9 /usr/share/cracklib/pw_dict.pwd
+
+echo "Minimizing locale-archive."
+localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
+mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+/usr/sbin/build-locale-archive
+# this is really kludgy and will be fixed with a better way of building
+# these containers
+mv /usr/share/locale/en /usr/share/locale/en_US /tmp
+rm -rf /usr/share/locale/*
+mv /tmp/en /tmp/en_US /usr/share/locale/
+mv /usr/share/i18n/locales/en_US /tmp
+rm -rf /usr/share/i18n/locales/*
+mv /tmp/en_US /usr/share/i18n/locales/
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
+
+echo "Removing extra packages."
+rm -vf /etc/yum/protected.d/*
+yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+echo "Removing boot, since we don't need that."
+rm -rf /boot/*
+
+echo "Cleaning old yum repodata."
+yum clean all
+rm -rf /var/lib/yum/yumdb/*
+truncate -c -s 0 /var/log/yum.log
+
+echo "Fixing SELinux contexts."
+/usr/sbin/fixfiles -R -a restore
+
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+%end
+
diff --git a/container/container-small-20.ks b/container/container-small-20.ks
new file mode 100644
index 0000000..9266a0e
--- /dev/null
+++ b/container/container-small-20.ks
@@ -0,0 +1,148 @@
+# This is a kickstart for making a non-bootable container environment.
+#
+# Convert the result to a tarfile with
+#
+# virt-tar-out -a fedora.qcow2 / - | bzip2 --best > fedora.tar.bz2
+#
+#
+# This kickstart file is designed to be used with appliance-creator and
+# may need slight modification for use with actual anaconda or other tools.
+# We intend to target anaconda-in-a-vm style image building for F20, but
+# not necessarily for containers -- that's yet to be worked out.
+
+lang en_US.UTF-8
+keyboard us
+timezone --utc Etc/UTC
+
+auth --useshadow --enablemd5
+selinux --enforcing
+rootpw --lock --iscrypted locked
+
+zerombr
+clearpart --all
+part / --size 1024 --fstype ext4
+
+# Repositories
+repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-20&arch=$basearch
+repo --name=fedora-updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f20&arch=$basearch
+
+reboot
+
+# Package list.
+%packages --excludedocs
+
+bash
+coreutils
+fedora-release
+filesystem
+findutils
+grep
+iproute
+sed
+setup
+yum
+
+# removed below
+passwd
+# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
+firewalld
+
+%end
+
+
+
+%post --erroronfail
+
+# setup systemd to boot to the right runlevel
+echo -n "Setting default runlevel to multiuser text mode"
+rm -f /etc/systemd/system/default.target
+ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
+echo .
+
+# create devices which appliance-creator does not
+ln -s /proc/kcore /dev/core
+mknod -m 600 /dev/console c 5 1
+mknod -m 660 /dev/loop0 b 7 0
+mknod -m 660 /dev/loop1 b 7 1
+
+echo -n "Network fixes"
+# initscripts don't like this file to be missing.
+cat > /etc/sysconfig/network << EOF
+NETWORKING=yes
+NOZEROCONF=yes
+EOF
+
+# For cloud images, 'eth0' _is_ the predictable device name, since
+# we don't want to be tied to specific virtual (!) hardware
+rm -f /etc/udev/rules.d/70*
+ln -s /dev/null /etc/udev/rules.d/80-net-name-slot.rules
+
+# simple eth0 config, again not hard-coded to the build hardware
+cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EOF
+DEVICE="eth0"
+BOOTPROTO="dhcp"
+ONBOOT="yes"
+TYPE="Ethernet"
+EOF
+
+# generic localhost names
+cat > /etc/hosts << EOF
+127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4
+::1 localhost localhost.localdomain localhost6 localhost6.localdomain6
+
+EOF
+echo .
+
+
+# Because memory is scarce resource in most cloud/virt environments,
+# and because this impedes forensics, we are differing from the Fedora
+# default of having /tmp on tmpfs.
+echo "Disabling tmpfs for /tmp."
+systemctl mask tmp.mount
+
+echo "Removing random-seed so it's not the same in every image."
+rm -f /var/lib/random-seed
+
+
+echo "Compressing cracklib."
+gzip -9 /usr/share/cracklib/pw_dict.pwd
+
+echo "Minimizing locale-archive."
+localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
+mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
+/usr/sbin/build-locale-archive
+# this is really kludgy and will be fixed with a better way of building
+# these containers
+mv /usr/share/locale/en /usr/share/locale/en_US /tmp
+rm -rf /usr/share/locale/*
+mv /tmp/en /tmp/en_US /usr/share/locale/
+mv /usr/share/i18n/locales/en_US /tmp
+rm -rf /usr/share/i18n/locales/*
+mv /tmp/en_US /usr/share/i18n/locales/
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
+
+echo "Removing extra packages."
+rm -vf /etc/yum/protected.d/*
+yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
+yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
+
+echo "Removing boot, since we don't need that."
+rm -rf /boot/*
+
+echo "Cleaning old yum repodata."
+yum clean all
+rm -rf /var/lib/yum/yumdb/*
+truncate -c -s 0 /var/log/yum.log
+
+echo "Fixing SELinux contexts."
+/usr/sbin/fixfiles -R -a restore
+
+
+echo "Zeroing out empty space."
+# This forces the filesystem to reclaim space from deleted files
+dd bs=1M if=/dev/zero of=/var/tmp/zeros || :
+rm -f /var/tmp/zeros
+echo "(Don't worry -- that out-of-space error was expected.)"
+
+%end
+
commit b214082a87c4ada3c823c1b3dbad96c90094f970
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sun Sep 22 20:16:35 2013 -0400
don't remove findutils
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
index 379bdd4..4e19ded 100644
--- a/container/container-minimal-19.ks
+++ b/container/container-minimal-19.ks
@@ -124,7 +124,6 @@ echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
-yum -C -y remove findutils --setopt="clean_requirements_on_remove=1"
yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
echo "Removing boot, since we don't need that."
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
index bc90457..9266a0e 100644
--- a/container/container-minimal-20.ks
+++ b/container/container-minimal-20.ks
@@ -124,7 +124,6 @@ echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
yum -C -y remove passwd --setopt="clean_requirements_on_remove=1"
-yum -C -y remove findutils --setopt="clean_requirements_on_remove=1"
yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
echo "Removing boot, since we don't need that."
commit 31fe6b6af9b6ab628f8ccb19bb565611eff884ee
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sun Sep 22 20:12:20 2013 -0400
less agressive with the yum history munging
diff --git a/container/container-medium-19.ks b/container/container-medium-19.ks
index 0eefe6c..313ac58 100644
--- a/container/container-medium-19.ks
+++ b/container/container-medium-19.ks
@@ -120,9 +120,7 @@ yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
echo "Cleaning old yum repodata."
yum clean all
-rm -rf /var/lib/yum/yumdb/*
-rm -rf /var/lib/yum/history/*
-yum history new || yum history new
+yum history new
truncate -c -s 0 /var/log/yum.log
echo "Removing boot, since we don't need that."
diff --git a/container/container-medium-20.ks b/container/container-medium-20.ks
index 5c90c61..03988e3 100644
--- a/container/container-medium-20.ks
+++ b/container/container-medium-20.ks
@@ -120,9 +120,7 @@ yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
echo "Cleaning old yum repodata."
yum clean all
-rm -rf /var/lib/yum/yumdb/*
-rm -rf /var/lib/yum/history/*
-yum history new || yum history new
+yum history new
truncate -c -s 0 /var/log/yum.log
echo "Removing boot, since we don't need that."
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
index 97aa7ee..379bdd4 100644
--- a/container/container-minimal-19.ks
+++ b/container/container-minimal-19.ks
@@ -43,7 +43,6 @@ setup
yum
# removed below
-findutils
passwd
# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
firewalld
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
index 2a9fa1b..bc90457 100644
--- a/container/container-minimal-20.ks
+++ b/container/container-minimal-20.ks
@@ -43,7 +43,6 @@ setup
yum
# removed below
-findutils
passwd
# https://bugzilla.redhat.com/show_bug.cgi?id=1004976
firewalld
commit 5765cb05d2e96182ab64c9b9f8982e1a0303f230
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sun Sep 22 20:02:18 2013 -0400
find, grep, sed -- really, we need 'em
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
index f0fe76d..97aa7ee 100644
--- a/container/container-minimal-19.ks
+++ b/container/container-minimal-19.ks
@@ -35,7 +35,10 @@ bash
coreutils
fedora-release
filesystem
+findutils
+grep
iproute
+sed
setup
yum
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
index 6c9304f..2a9fa1b 100644
--- a/container/container-minimal-20.ks
+++ b/container/container-minimal-20.ks
@@ -35,7 +35,10 @@ bash
coreutils
fedora-release
filesystem
+findutils
+grep
iproute
+sed
setup
yum
commit 403090d2234b535f85af74bba7b549bea59b687e
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sun Sep 22 19:28:15 2013 -0400
mixed-up rpm macros filename
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
index 3ddff3f..f0fe76d 100644
--- a/container/container-minimal-19.ks
+++ b/container/container-minimal-19.ks
@@ -117,7 +117,7 @@ mv /tmp/en /tmp/en_US /usr/share/locale/
mv /usr/share/i18n/locales/en_US /tmp
rm -rf /usr/share/i18n/locales/*
mv /tmp/en_US /usr/share/i18n/locales/
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/rpm.imgcreate
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
index 06a100d..6c9304f 100644
--- a/container/container-minimal-20.ks
+++ b/container/container-minimal-20.ks
@@ -117,7 +117,7 @@ mv /tmp/en /tmp/en_US /usr/share/locale/
mv /usr/share/i18n/locales/en_US /tmp
rm -rf /usr/share/i18n/locales/*
mv /tmp/en_US /usr/share/i18n/locales/
-echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/rpm.imgcreate
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/macros.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
commit a4d70fb6eb96d4708b977cea5c8db0a9ab79199c
Author: Matthew Miller <mattdm@xxxxxxxxxx>
Date: Sun Sep 22 17:44:53 2013 -0400
temporary destruction of i18n in the minimal container -- need a better way!
diff --git a/container/container-minimal-19.ks b/container/container-minimal-19.ks
index 5f15a0b..3ddff3f 100644
--- a/container/container-minimal-19.ks
+++ b/container/container-minimal-19.ks
@@ -109,6 +109,15 @@ echo "Minimizing locale-archive."
localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
/usr/sbin/build-locale-archive
+# this is really kludgy and will be fixed with a better way of building
+# these containers
+mv /usr/share/locale/en /usr/share/locale/en_US /tmp
+rm -rf /usr/share/locale/*
+mv /tmp/en /tmp/en_US /usr/share/locale/
+mv /usr/share/i18n/locales/en_US /tmp
+rm -rf /usr/share/i18n/locales/*
+mv /tmp/en_US /usr/share/i18n/locales/
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/rpm.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
diff --git a/container/container-minimal-20.ks b/container/container-minimal-20.ks
index c052a0e..06a100d 100644
--- a/container/container-minimal-20.ks
+++ b/container/container-minimal-20.ks
@@ -109,6 +109,15 @@ echo "Minimizing locale-archive."
localedef --list-archive | grep -v en_US | xargs localedef --delete-from-archive
mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
/usr/sbin/build-locale-archive
+# this is really kludgy and will be fixed with a better way of building
+# these containers
+mv /usr/share/locale/en /usr/share/locale/en_US /tmp
+rm -rf /usr/share/locale/*
+mv /tmp/en /tmp/en_US /usr/share/locale/
+mv /usr/share/i18n/locales/en_US /tmp
+rm -rf /usr/share/i18n/locales/*
+mv /tmp/en_US /usr/share/i18n/locales/
+echo '%_install_langs C:en:en_US:en_US.UTF-8' >> /etc/rpm/rpm.imgcreate
echo "Removing extra packages."
rm -vf /etc/yum/protected.d/*
_______________________________________________
cloud mailing list
cloud@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/cloud
Fedora Code of Conduct: http://fedoraproject.org/code-of-conduct
