From 2e25c4255746b144932f84b7b6671d7d03f52278 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Sat, 13 Jun 2009 10:48:16 +0100 Subject: Rename (make|update)-initramfs.sh.in -> (make|update).sh.in --- .gitignore | 5 +- appliance/Makefile.am | 10 +-- appliance/make-initramfs.sh.in | 179 --------------------------------------- appliance/make.sh.in | 179 +++++++++++++++++++++++++++++++++++++++ appliance/update-initramfs.sh.in | 36 -------- appliance/update.sh.in | 36 ++++++++ configure.ac | 4 +- 7 files changed, 224 insertions(+), 225 deletions(-) delete mode 100755 appliance/make-initramfs.sh.in create mode 100755 appliance/make.sh.in delete mode 100755 appliance/update-initramfs.sh.in create mode 100755 appliance/update.sh.in diff --git a/.gitignore b/.gitignore index 296db62f..b64c3778 100644 --- a/.gitignore +++ b/.gitignore @@ -21,9 +21,8 @@ Makefile.in Makefile aclocal.m4 appliance/initramfs.*.img -appliance/make-initramfs.sh -appliance/make-initramfs.sh.in.old -appliance/update-initramfs.sh +appliance/make.sh +appliance/update.sh appliance/vmlinuz.* autom4te.cache capitests/test-command diff --git a/appliance/Makefile.am b/appliance/Makefile.am index 066becbb..1886e3e1 100644 --- a/appliance/Makefile.am +++ b/appliance/Makefile.am @@ -16,7 +16,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. EXTRA_DIST = \ - make-initramfs.sh update-initramfs.sh + make.sh update.sh # Build the root filesystem (appliance). # Currently this is arch-dependent, so it seems like putting it in @@ -32,17 +32,17 @@ fs_DATA = $(INITRAMFSIMG) $(VMLINUZ) $(INITRAMFSIMG) $(VMLINUZ): $(top_builddir)/initramfs/fakeroot.log -$(top_builddir)/initramfs/fakeroot.log: make-initramfs.sh.in +$(top_builddir)/initramfs/fakeroot.log: make.sh -mv $(INITRAMFSIMG) $(INITRAMFSIMG).bak -mv $(VMLINUZ) $(VMLINUZ).bak - if ! bash make-initramfs.sh; then rm -f $@; exit 1; fi + if ! bash make.sh; then rm -f $@; exit 1; fi $(INITRAMFSIMG): $(top_builddir)/initramfs/fakeroot.log $(top_builddir)/daemon/guestfsd rm -f $@ - bash update-initramfs.sh + bash update.sh touch $@ -make-initramfs.sh: make-initramfs.sh.in +make.sh: make.sh.in cd .. && ./config.status appliance/$@ # Test-boot the image. diff --git a/appliance/make-initramfs.sh.in b/appliance/make-initramfs.sh.in deleted file mode 100755 index b39b13d6..00000000 --- a/appliance/make-initramfs.sh.in +++ /dev/null @@ -1,179 +0,0 @@ -#!/bin/bash - -# @configure_input@ -# Copyright (C) 2009 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# This is called from the Makefile to build the initramfs. - -unset CDPATH - -set -e - -cd @top_builddir@ - -modules=" --i augeas-libs --i bash --i binutils --i coreutils --i dosfstools --i file --i grub --i iputils --i kernel --i lvm2 --i MAKEDEV --i module-init-tools --i net-tools --i ntfs-3g --i ntfsprogs --i procps --i strace --i util-linux-ng --i zerofree -" - -# Decide on names for the final output. These have to match Makefile.am. -output=appliance/initramfs.@REPO@.@host_cpu@.img -koutput=appliance/vmlinuz.@REPO@.@host_cpu@ -rm -f $output -rm -f $koutput - -# Create the basic initramfs. -@FEBOOTSTRAP@ $modules -u @UPDATES@ @REPO@ initramfs @MIRROR@ - -# /sysroot is where the guest root filesystem will be mounted. -@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /sysroot - -# Create /tmp if it is missing. -@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /tmp - -# Nuke some stuff. The kernel pulls mkinitrd and plymouth which pulls in -# all of Python. Sheez. -(cd initramfs && find -name '*plymouth*' -print0) | - xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf -(cd initramfs && find -name '*python*' -print0) | - xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf - -# In Fedora >= 11, it pulls in all of Perl from somewhere. Nuke from orbit. -@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/perl5 /usr/lib64/perl5 - -# Anaconda? JPEG images? -@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/anaconda-runtime - -# Modules take up nearly half of the image. It's a rough guess that -# we don't need many drivers (which take up most of the space). -(cd initramfs && find lib/modules/*/kernel \ - -name '*.ko' \ - -a ! -name 'virtio.ko' \ - -a ! -name 'virtio_net.ko' \ - -a ! -name 'virtio_pci.ko' \ - -a ! -name 'virtio_ring.ko' \ - -a ! -name 'ext2.ko' \ - -a ! -name 'ext3.ko' \ - -a ! -name 'ext4*.ko' \ - -a ! -name 'crc16.ko' \ - -a ! -name 'jbd.ko' \ - -a ! -name 'jbd2.ko' \ - -a ! -name 'fuse.ko' \ - -a ! -name 'vfat.ko' \ - -a ! -name 'fat.ko' \ - -a ! -name 'udf.ko' \ - -a ! -name 'crc_itu_t.ko' \ - -a ! -name 'nls_utf8.ko' \ - -a ! -name 'dm-*.ko' \ - -a ! -name 'cramfs.ko' \ - -a ! -name 'squashfs.ko' \ - -a ! -name 'hfsplus.ko' \ - -a ! -name 'ufs.ko' \ - -a ! -name 'exportfs.ko' \ - -a ! -name 'xfs.ko' \ - -a -print0 ) | - xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm - -# Pull the kernel out into the current directory. We don't want it in -# the initramfs image. -cp initramfs/boot/vmlinuz* $koutput -@FEBOOTSTRAP_RUN@ initramfs -- rm -rf boot - -# Minimize the image. -@FEBOOTSTRAP_MINIMIZE@ initramfs - -# Add some missing configuration files. -if [ ! -f initramfs/etc/hosts ]; then - cat > hosts.new <<'__EOF__' -127.0.0.1 guestfs localhost.localdomain localhost -::1 localhost6.localdomain6 localhost6 -__EOF__ - @FEBOOTSTRAP_INSTALL@ initramfs hosts.new /etc/hosts 0644 root.root - rm hosts.new -fi - -if [ ! -f initramfs/etc/fstab ]; then - @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab -fi - -echo nameserver 10.0.2.3 > resolv.conf.new -@FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root -rm resolv.conf.new - -# Create the init script. -cat > init.new <<'__EOF__' -#!/bin/sh -echo Starting /init script ... -PATH=/sbin:/usr/sbin:$PATH -mount -t tmpfs none /dev -mkdir /dev/pts /dev/shm /dev/mapper -MAKEDEV mem null port zero core full ram tty console fd \ - hda hdb hdc hdd sda sdb sdc sdd loop sd -mknod /dev/ptmx c 5 2; chmod 0666 /dev/ptmx -mknod /dev/random c 1 8; chmod 0666 /dev/random -mknod /dev/urandom c 1 9; chmod 0444 /dev/urandom -mount -t proc /proc /proc -mount -t sysfs /sys /sys -mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts -ln -sf /proc/self/fd/0 /dev/stdin -ln -sf /proc/self/fd/1 /dev/stdout -ln -sf /proc/self/fd/2 /dev/stderr -modprobe virtio_pci -modprobe virtio_net -modprobe dm_mod ||: -/sbin/ifconfig lo 127.0.0.1 -/sbin/ifconfig eth0 10.0.2.10 -/sbin/route add default gw 10.0.2.2 -lvm vgscan --ignorelockingfailure -lvm vgchange -ay --ignorelockingfailure -if grep -sq guestfs_rescue=1 /proc/cmdline; then - bash -i -fi -exec guestfsd -f -__EOF__ - -@FEBOOTSTRAP_INSTALL@ initramfs init.new /init 0755 root.root -rm init.new - -# Just in case the kernel isn't looking for /init, make /sbin/init -# be our script, not the real init. -#@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init - -# Copy the daemon into the filesystem. -@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root - -# Generate final image. -@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t -mv $output-t $output -ls -lh $output -ls -lh $koutput diff --git a/appliance/make.sh.in b/appliance/make.sh.in new file mode 100755 index 00000000..b39b13d6 --- /dev/null +++ b/appliance/make.sh.in @@ -0,0 +1,179 @@ +#!/bin/bash - +# @configure_input@ +# Copyright (C) 2009 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# This is called from the Makefile to build the initramfs. + +unset CDPATH + +set -e + +cd @top_builddir@ + +modules=" +-i augeas-libs +-i bash +-i binutils +-i coreutils +-i dosfstools +-i file +-i grub +-i iputils +-i kernel +-i lvm2 +-i MAKEDEV +-i module-init-tools +-i net-tools +-i ntfs-3g +-i ntfsprogs +-i procps +-i strace +-i util-linux-ng +-i zerofree +" + +# Decide on names for the final output. These have to match Makefile.am. +output=appliance/initramfs.@REPO@.@host_cpu@.img +koutput=appliance/vmlinuz.@REPO@.@host_cpu@ +rm -f $output +rm -f $koutput + +# Create the basic initramfs. +@FEBOOTSTRAP@ $modules -u @UPDATES@ @REPO@ initramfs @MIRROR@ + +# /sysroot is where the guest root filesystem will be mounted. +@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /sysroot + +# Create /tmp if it is missing. +@FEBOOTSTRAP_RUN@ initramfs -- mkdir -p --mode=0777 /tmp + +# Nuke some stuff. The kernel pulls mkinitrd and plymouth which pulls in +# all of Python. Sheez. +(cd initramfs && find -name '*plymouth*' -print0) | + xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf +(cd initramfs && find -name '*python*' -print0) | + xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm -rf + +# In Fedora >= 11, it pulls in all of Perl from somewhere. Nuke from orbit. +@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/perl5 /usr/lib64/perl5 + +# Anaconda? JPEG images? +@FEBOOTSTRAP_RUN@ initramfs -- rm -rf /usr/lib/anaconda-runtime + +# Modules take up nearly half of the image. It's a rough guess that +# we don't need many drivers (which take up most of the space). +(cd initramfs && find lib/modules/*/kernel \ + -name '*.ko' \ + -a ! -name 'virtio.ko' \ + -a ! -name 'virtio_net.ko' \ + -a ! -name 'virtio_pci.ko' \ + -a ! -name 'virtio_ring.ko' \ + -a ! -name 'ext2.ko' \ + -a ! -name 'ext3.ko' \ + -a ! -name 'ext4*.ko' \ + -a ! -name 'crc16.ko' \ + -a ! -name 'jbd.ko' \ + -a ! -name 'jbd2.ko' \ + -a ! -name 'fuse.ko' \ + -a ! -name 'vfat.ko' \ + -a ! -name 'fat.ko' \ + -a ! -name 'udf.ko' \ + -a ! -name 'crc_itu_t.ko' \ + -a ! -name 'nls_utf8.ko' \ + -a ! -name 'dm-*.ko' \ + -a ! -name 'cramfs.ko' \ + -a ! -name 'squashfs.ko' \ + -a ! -name 'hfsplus.ko' \ + -a ! -name 'ufs.ko' \ + -a ! -name 'exportfs.ko' \ + -a ! -name 'xfs.ko' \ + -a -print0 ) | + xargs -0 @FEBOOTSTRAP_RUN@ initramfs -- rm + +# Pull the kernel out into the current directory. We don't want it in +# the initramfs image. +cp initramfs/boot/vmlinuz* $koutput +@FEBOOTSTRAP_RUN@ initramfs -- rm -rf boot + +# Minimize the image. +@FEBOOTSTRAP_MINIMIZE@ initramfs + +# Add some missing configuration files. +if [ ! -f initramfs/etc/hosts ]; then + cat > hosts.new <<'__EOF__' +127.0.0.1 guestfs localhost.localdomain localhost +::1 localhost6.localdomain6 localhost6 +__EOF__ + @FEBOOTSTRAP_INSTALL@ initramfs hosts.new /etc/hosts 0644 root.root + rm hosts.new +fi + +if [ ! -f initramfs/etc/fstab ]; then + @FEBOOTSTRAP_RUN@ initramfs -- touch /etc/fstab +fi + +echo nameserver 10.0.2.3 > resolv.conf.new +@FEBOOTSTRAP_INSTALL@ initramfs resolv.conf.new /etc/resolv.conf 0644 root.root +rm resolv.conf.new + +# Create the init script. +cat > init.new <<'__EOF__' +#!/bin/sh +echo Starting /init script ... +PATH=/sbin:/usr/sbin:$PATH +mount -t tmpfs none /dev +mkdir /dev/pts /dev/shm /dev/mapper +MAKEDEV mem null port zero core full ram tty console fd \ + hda hdb hdc hdd sda sdb sdc sdd loop sd +mknod /dev/ptmx c 5 2; chmod 0666 /dev/ptmx +mknod /dev/random c 1 8; chmod 0666 /dev/random +mknod /dev/urandom c 1 9; chmod 0444 /dev/urandom +mount -t proc /proc /proc +mount -t sysfs /sys /sys +mount -t devpts -o gid=5,mode=620 /dev/pts /dev/pts +ln -sf /proc/self/fd/0 /dev/stdin +ln -sf /proc/self/fd/1 /dev/stdout +ln -sf /proc/self/fd/2 /dev/stderr +modprobe virtio_pci +modprobe virtio_net +modprobe dm_mod ||: +/sbin/ifconfig lo 127.0.0.1 +/sbin/ifconfig eth0 10.0.2.10 +/sbin/route add default gw 10.0.2.2 +lvm vgscan --ignorelockingfailure +lvm vgchange -ay --ignorelockingfailure +if grep -sq guestfs_rescue=1 /proc/cmdline; then + bash -i +fi +exec guestfsd -f +__EOF__ + +@FEBOOTSTRAP_INSTALL@ initramfs init.new /init 0755 root.root +rm init.new + +# Just in case the kernel isn't looking for /init, make /sbin/init +# be our script, not the real init. +#@FEBOOTSTRAP_RUN@ initramfs -- ln -f /init /sbin/init + +# Copy the daemon into the filesystem. +@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root + +# Generate final image. +@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t +mv $output-t $output +ls -lh $output +ls -lh $koutput diff --git a/appliance/update-initramfs.sh.in b/appliance/update-initramfs.sh.in deleted file mode 100755 index 3b779f85..00000000 --- a/appliance/update-initramfs.sh.in +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -# @configure_input@ -# Copyright (C) 2009 Red Hat Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -# Update the daemon inside an existing initramfs. Avoids the -# timeconsuming rebuild. - -unset CDPATH - -set -e - -cd @top_builddir@ - -output=appliance/initramfs.@REPO@.@host_cpu@.img - -# Copy the daemon into the filesystem. -@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root - -# Generate final image. -@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t -mv $output-t $output -ls -lh $output diff --git a/appliance/update.sh.in b/appliance/update.sh.in new file mode 100755 index 00000000..3b779f85 --- /dev/null +++ b/appliance/update.sh.in @@ -0,0 +1,36 @@ +#!/bin/bash - +# @configure_input@ +# Copyright (C) 2009 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +# Update the daemon inside an existing initramfs. Avoids the +# timeconsuming rebuild. + +unset CDPATH + +set -e + +cd @top_builddir@ + +output=appliance/initramfs.@REPO@.@host_cpu@.img + +# Copy the daemon into the filesystem. +@FEBOOTSTRAP_INSTALL@ initramfs daemon/guestfsd /sbin/guestfsd 0755 root.root + +# Generate final image. +@FEBOOTSTRAP_TO_INITRAMFS@ initramfs > $output-t +mv $output-t $output +ls -lh $output diff --git a/configure.ac b/configure.ac index 3e613989..f1562f49 100644 --- a/configure.ac +++ b/configure.ac @@ -452,7 +452,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile src/Makefile fish/Makefile po/Makefile.in examples/Makefile appliance/Makefile - appliance/make-initramfs.sh appliance/update-initramfs.sh + appliance/make.sh appliance/update.sh images/Makefile capitests/Makefile regressions/Makefile @@ -468,7 +468,7 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT dnl WTF? -chmod +x appliance/make-initramfs.sh appliance/update-initramfs.sh +chmod +x appliance/make.sh appliance/update.sh dnl Produce summary. echo -- cgit