From 9bb62c8a50e9e92b0e0d637c624d364be6a911ca Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 24 Jun 2013 21:27:15 +0200 Subject: Reorganizing backend in source tree. --- Makefile | 6 +- backend/dracut/live.script | 11 ++ backend/initramfs-tools/live.hook | 241 +++++++++++++++++++++++++++++++++++ backend/initramfs-tools/live.script | 13 ++ backends/dracut/live.script | 11 -- backends/initramfs-tools/live.hook | 241 ----------------------------------- backends/initramfs-tools/live.script | 13 -- 7 files changed, 268 insertions(+), 268 deletions(-) create mode 100755 backend/dracut/live.script create mode 100755 backend/initramfs-tools/live.hook create mode 100755 backend/initramfs-tools/live.script delete mode 100755 backends/dracut/live.script delete mode 100755 backends/initramfs-tools/live.hook delete mode 100755 backends/initramfs-tools/live.script diff --git a/Makefile b/Makefile index d083027..16ad560 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ SHELL := sh -e LANGUAGES = $(shell cd manpages/po && ls) -SCRIPTS = backends/*/* bin/* scripts/*.sh scripts/*/*-* +SCRIPTS = backend/*/* bin/* scripts/*.sh scripts/*/*-* all: build @@ -47,9 +47,9 @@ install: # Installing executables mkdir -p $(DESTDIR)/usr/share/initramfs-tools/hooks - cp backends/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live + cp backend/initramfs-tools/live.hook $(DESTDIR)/usr/share/initramfs-tools/hooks/live mkdir -p $(DESTDIR)/usr/share/initramfs-tools/scripts - cp backends/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live + cp backend/initramfs-tools/live.script $(DESTDIR)/usr/share/initramfs-tools/scripts/live # Installing docs mkdir -p $(DESTDIR)/usr/share/doc/live-boot diff --git a/backend/dracut/live.script b/backend/dracut/live.script new file mode 100755 index 0000000..223f355 --- /dev/null +++ b/backend/dracut/live.script @@ -0,0 +1,11 @@ +#!/bin/sh + +#set -e + +. /lib/live/boot.sh + +DRACUT_FIXME () +{ + # dracut entry point for live-boot is FIXME(); function + Live +} diff --git a/backend/initramfs-tools/live.hook b/backend/initramfs-tools/live.hook new file mode 100755 index 0000000..1814211 --- /dev/null +++ b/backend/initramfs-tools/live.hook @@ -0,0 +1,241 @@ +#!/bin/sh + +set -e + +. /usr/share/initramfs-tools/hook-functions + +[ "${QUIET}" ] || echo -n "live-boot:" + +# Reading configuration file from filesystem and live-media +for _FILE in /etc/live/boot.conf /etc/live/boot/* \ + /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/* +do + if [ -e "${_FILE}" ] + then + . "${_FILE}" + fi +done + +# Checking live-boot +if [ ! -e /lib/live/boot ] +then + echo + echo "W: live-boot-initramfs-tools (backend) installed without live-boot," + echo "W: this initramfs will *NOT* have live support." + exit 0 +fi + +[ "${QUIET}" ] || echo -n " core" + +mkdir -p "${DESTDIR}/lib/live" +cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live" + +# klibc dependencies +for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr* +do + if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1 + then + cp -a "${FILE}" "${DESTDIR}"/"${FILE}" + fi +done + +# udev dependencies +for FILE in /lib/udev/*_id +do + copy_exec "${FILE}" +done + +if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] +then + mkdir -p ${DESTDIR}/lib/udev/rules.d + cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d +fi + +[ "${QUIET}" ] || echo -n " filesystems" + +# Configuration: keymap (usefull when using encryption) +if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ] +then + copy_exec /bin/loadkeys + + mkdir -p "${DESTDIR}"/etc + cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc +fi + +# Configuration: Unique ID +if [ -n "${LIVE_GENERATE_UUID}" ] +then + mkdir -p "${DESTDIR}"/conf + uuidgen -r > "${DESTDIR}"/conf/uuid.conf +fi + +# Filesystem: btrfs +manual_add_modules btrfs + +# Filesystem: cifs +if [ -x /sbin/mount.cifs ] +then + copy_exec /sbin/mount.cifs + manual_add_modules cifs +fi + +# Filesystem: ext3/ext4 +manual_add_modules ext3 +manual_add_modules ext4 + +# Filesystem: hfs/hfsplus +manual_add_modules hfs +manual_add_modules hfsplus + +# Filesystem: jffs2 +manual_add_modules jffs2 + +if [ -x /usr/bin/rsync ] +then + copy_exec /usr/bin/rsync /bin +fi + +# Filesystem: squashfs +copy_exec /sbin/losetup +manual_add_modules loop +manual_add_modules squashfs +manual_add_modules sqlzma +manual_add_modules unlzma + +# Filesystem: aufs/overlayfs/unionfs +manual_add_modules aufs +manual_add_modules overlayfs +manual_add_modules unionfs + +# Filesystem: unionfs-fuse +if [ -x /usr/bin/unionfs-fuse ] +then + copy_exec /usr/bin/unionfs-fuse /bin +fi + +# Filesystem: vfat +manual_add_modules nls_cp437 +manual_add_modules nls_iso8859-1 +manual_add_modules nls_utf8 +manual_add_modules vfat + +# Filesystem: ntfs +manual_add_modules ntfs + +[ "${QUIET}" ] || echo -n " devices" +# Hardware: cdrom +manual_add_modules ide-cd +manual_add_modules ide-generic +manual_add_modules ohci1394 +manual_add_modules sbp2 +manual_add_modules sr_mod + +# Hardware: usb +manual_add_modules sd_mod + +# Hardware: network +auto_add_modules net + +# Program: eject +if [ -x /usr/bin/eject ] +then + copy_exec /usr/bin/eject /bin +fi + +# Program: mount +# fuse does not work with klibc mount +copy_exec /bin/mount /bin/mount.util-linux + +[ "${QUIET}" ] || echo -n " utils" + +# Feature: Verify Checksums +if [ -e /etc/progress-linux_version ] +then + copy_exec /usr/bin/sha256sum /bin +else + copy_exec /usr/bin/md5sum /bin +fi + +# Program: memdisk +if [ -x /usr/bin/memdiskfind ] +then +[ "${QUIET}" ] || echo -n " memdisk" + copy_exec /usr/bin/memdiskfind + manual_add_modules phram + manual_add_modules mtdblock +fi + +# Program: udev +if [ -x /sbin/udevadm ] +then + [ "${QUIET}" ] || echo -n " udev" + copy_exec /sbin/udevadm +fi + +# Program: wget +if [ -x /usr/bin/wget ] +then + [ "${QUIET}" ] || echo -n " wget" + copy_exec /usr/bin/wget /bin +fi + +# Program: blockdev +if [ -x /sbin/blockdev ] +then + [ "${QUIET}" ] || echo -n " blockdev" + copy_exec /sbin/blockdev +fi + +# FUSE kernel module +manual_add_modules fuse + +# FUSE filesystem: httpfs2 +if [ -x /usr/bin/httpfs2_ssl ] +then + [ "${QUIET}" ] || echo -n " httpfs:ssl" + copy_exec /usr/bin/httpfs2_ssl /bin/httpfs +elif [ -x /usr/bin/httpfs2 ] +then + [ "${QUIET}" ] || echo -n " httpfs" + copy_exec /usr/bin/httpfs2 /bin/httpfs +fi + +# FUSE filesystem: curlftpfs +if [ -x /usr/bin/curlftpfs ] +then + [ "${QUIET}" ] || echo -n " ftpfs" + copy_exec /usr/bin/curlftpfs /bin +fi + +# iSCSI +if [ -x /usr/sbin/iscsistart ] +then + [ "${QUIET}" ] || echo -n " iscsi" + copy_exec /usr/sbin/iscsistart /bin + #manual_add_modules ib_iser + manual_add_modules iscsi_tcp + manual_add_modules crc32c +fi + +# Some experimental stuff + +case "${LIVE_DNS}" in + true) + [ "${QUIET}" ] || echo -n " dns" + + # /lib/libnss_dns.so.*:a DNS + # /lib/libnss_files.so.*: /etc/hosts and /etc/passwd + # /lib/libnss_compat.so.*: /etc/passwd + + for _SHLIB in $(find /lib -name 'libnss_dns.so.*') + do + copy_exec "${_SHLIB}" + done + + # might be needed if /etc/hosts is used + #mkdir -p "${DESTDIR}/etc" + #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" + ;; +esac + +[ "${QUIET}" ] || echo . diff --git a/backend/initramfs-tools/live.script b/backend/initramfs-tools/live.script new file mode 100755 index 0000000..9646274 --- /dev/null +++ b/backend/initramfs-tools/live.script @@ -0,0 +1,13 @@ +#!/bin/sh + +#set -e + +. /lib/live/boot.sh + +. /scripts/functions + +mountroot () +{ + # initramfs-tools entry point for live-boot is mountroot(); function + Live +} diff --git a/backends/dracut/live.script b/backends/dracut/live.script deleted file mode 100755 index 223f355..0000000 --- a/backends/dracut/live.script +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -#set -e - -. /lib/live/boot.sh - -DRACUT_FIXME () -{ - # dracut entry point for live-boot is FIXME(); function - Live -} diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook deleted file mode 100755 index 1814211..0000000 --- a/backends/initramfs-tools/live.hook +++ /dev/null @@ -1,241 +0,0 @@ -#!/bin/sh - -set -e - -. /usr/share/initramfs-tools/hook-functions - -[ "${QUIET}" ] || echo -n "live-boot:" - -# Reading configuration file from filesystem and live-media -for _FILE in /etc/live/boot.conf /etc/live/boot/* \ - /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/* -do - if [ -e "${_FILE}" ] - then - . "${_FILE}" - fi -done - -# Checking live-boot -if [ ! -e /lib/live/boot ] -then - echo - echo "W: live-boot-initramfs-tools (backend) installed without live-boot," - echo "W: this initramfs will *NOT* have live support." - exit 0 -fi - -[ "${QUIET}" ] || echo -n " core" - -mkdir -p "${DESTDIR}/lib/live" -cp -a /lib/live/boot.sh /lib/live/boot "${DESTDIR}/lib/live" - -# klibc dependencies -for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr* -do - if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1 - then - cp -a "${FILE}" "${DESTDIR}"/"${FILE}" - fi -done - -# udev dependencies -for FILE in /lib/udev/*_id -do - copy_exec "${FILE}" -done - -if [ -e /lib/udev/rules.d/60-cdrom_id.rules ] -then - mkdir -p ${DESTDIR}/lib/udev/rules.d - cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d -fi - -[ "${QUIET}" ] || echo -n " filesystems" - -# Configuration: keymap (usefull when using encryption) -if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ] -then - copy_exec /bin/loadkeys - - mkdir -p "${DESTDIR}"/etc - cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc -fi - -# Configuration: Unique ID -if [ -n "${LIVE_GENERATE_UUID}" ] -then - mkdir -p "${DESTDIR}"/conf - uuidgen -r > "${DESTDIR}"/conf/uuid.conf -fi - -# Filesystem: btrfs -manual_add_modules btrfs - -# Filesystem: cifs -if [ -x /sbin/mount.cifs ] -then - copy_exec /sbin/mount.cifs - manual_add_modules cifs -fi - -# Filesystem: ext3/ext4 -manual_add_modules ext3 -manual_add_modules ext4 - -# Filesystem: hfs/hfsplus -manual_add_modules hfs -manual_add_modules hfsplus - -# Filesystem: jffs2 -manual_add_modules jffs2 - -if [ -x /usr/bin/rsync ] -then - copy_exec /usr/bin/rsync /bin -fi - -# Filesystem: squashfs -copy_exec /sbin/losetup -manual_add_modules loop -manual_add_modules squashfs -manual_add_modules sqlzma -manual_add_modules unlzma - -# Filesystem: aufs/overlayfs/unionfs -manual_add_modules aufs -manual_add_modules overlayfs -manual_add_modules unionfs - -# Filesystem: unionfs-fuse -if [ -x /usr/bin/unionfs-fuse ] -then - copy_exec /usr/bin/unionfs-fuse /bin -fi - -# Filesystem: vfat -manual_add_modules nls_cp437 -manual_add_modules nls_iso8859-1 -manual_add_modules nls_utf8 -manual_add_modules vfat - -# Filesystem: ntfs -manual_add_modules ntfs - -[ "${QUIET}" ] || echo -n " devices" -# Hardware: cdrom -manual_add_modules ide-cd -manual_add_modules ide-generic -manual_add_modules ohci1394 -manual_add_modules sbp2 -manual_add_modules sr_mod - -# Hardware: usb -manual_add_modules sd_mod - -# Hardware: network -auto_add_modules net - -# Program: eject -if [ -x /usr/bin/eject ] -then - copy_exec /usr/bin/eject /bin -fi - -# Program: mount -# fuse does not work with klibc mount -copy_exec /bin/mount /bin/mount.util-linux - -[ "${QUIET}" ] || echo -n " utils" - -# Feature: Verify Checksums -if [ -e /etc/progress-linux_version ] -then - copy_exec /usr/bin/sha256sum /bin -else - copy_exec /usr/bin/md5sum /bin -fi - -# Program: memdisk -if [ -x /usr/bin/memdiskfind ] -then -[ "${QUIET}" ] || echo -n " memdisk" - copy_exec /usr/bin/memdiskfind - manual_add_modules phram - manual_add_modules mtdblock -fi - -# Program: udev -if [ -x /sbin/udevadm ] -then - [ "${QUIET}" ] || echo -n " udev" - copy_exec /sbin/udevadm -fi - -# Program: wget -if [ -x /usr/bin/wget ] -then - [ "${QUIET}" ] || echo -n " wget" - copy_exec /usr/bin/wget /bin -fi - -# Program: blockdev -if [ -x /sbin/blockdev ] -then - [ "${QUIET}" ] || echo -n " blockdev" - copy_exec /sbin/blockdev -fi - -# FUSE kernel module -manual_add_modules fuse - -# FUSE filesystem: httpfs2 -if [ -x /usr/bin/httpfs2_ssl ] -then - [ "${QUIET}" ] || echo -n " httpfs:ssl" - copy_exec /usr/bin/httpfs2_ssl /bin/httpfs -elif [ -x /usr/bin/httpfs2 ] -then - [ "${QUIET}" ] || echo -n " httpfs" - copy_exec /usr/bin/httpfs2 /bin/httpfs -fi - -# FUSE filesystem: curlftpfs -if [ -x /usr/bin/curlftpfs ] -then - [ "${QUIET}" ] || echo -n " ftpfs" - copy_exec /usr/bin/curlftpfs /bin -fi - -# iSCSI -if [ -x /usr/sbin/iscsistart ] -then - [ "${QUIET}" ] || echo -n " iscsi" - copy_exec /usr/sbin/iscsistart /bin - #manual_add_modules ib_iser - manual_add_modules iscsi_tcp - manual_add_modules crc32c -fi - -# Some experimental stuff - -case "${LIVE_DNS}" in - true) - [ "${QUIET}" ] || echo -n " dns" - - # /lib/libnss_dns.so.*:a DNS - # /lib/libnss_files.so.*: /etc/hosts and /etc/passwd - # /lib/libnss_compat.so.*: /etc/passwd - - for _SHLIB in $(find /lib -name 'libnss_dns.so.*') - do - copy_exec "${_SHLIB}" - done - - # might be needed if /etc/hosts is used - #mkdir -p "${DESTDIR}/etc" - #cp -p /etc/nsswitch.conf "${DESTDIR}/etc" - ;; -esac - -[ "${QUIET}" ] || echo . diff --git a/backends/initramfs-tools/live.script b/backends/initramfs-tools/live.script deleted file mode 100755 index 9646274..0000000 --- a/backends/initramfs-tools/live.script +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -#set -e - -. /lib/live/boot.sh - -. /scripts/functions - -mountroot () -{ - # initramfs-tools entry point for live-boot is mountroot(); function - Live -} -- cgit v1.2.3