[Debian-live-changes] r2486 - in dists/trunk/live-helper: data data/casper docs helpers includes/sid/live
daniel at alioth.debian.org
daniel at alioth.debian.org
Sat Jul 14 18:03:50 UTC 2007
Author: daniel
Date: 2007-07-14 18:03:50 +0000 (Sat, 14 Jul 2007)
New Revision: 2486
Added:
dists/trunk/live-helper/data/casper/
dists/trunk/live-helper/data/casper/parameters.txt
Removed:
dists/trunk/live-helper/includes/sid/live/parameters.txt.casper
dists/trunk/live-helper/includes/sid/live/parameters.txt.live-initramfs
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/helpers/lh_binary_includes
dists/trunk/live-helper/helpers/lh_binary_linux-image
Log:
Copied: dists/trunk/live-helper/data/casper/parameters.txt (from rev 2483, dists/trunk/live-helper/includes/sid/live/parameters.txt.casper)
===================================================================
--- dists/trunk/live-helper/data/casper/parameters.txt (rev 0)
+++ dists/trunk/live-helper/data/casper/parameters.txt 2007-07-14 18:03:50 UTC (rev 2486)
@@ -0,0 +1,29 @@
+Boot Parameters for Debian Live
+-------------------------------
+
+Updated for casper 1.77+debian-7 on 2007-02-08.
+
+These options (can be combined) work from the syslinux bootprompt:
+
+casper casper-getty
+casper xdebconf
+casper hostname=HOSTNAME
+casper userfullname=USERFULLNAME
+casper username=USERNAME
+casper {keyb|kbd-chooser/method}=KEYBOARD
+casper {klayout|console-setup/layoutcode}=LAYOUT
+casper {kvariant|console-setup/variantcode}=VARIANT ,
+casper {kmodel|console-setup/modelcode}=CODE , koptions=OPTIONS
+casper ip=IFACE,ADDRESS,NETMASK,GATEWAY[:IFACE,ADDRESS,NETMASK,GATEWAY]*
+casper ip[=frommedia]
+casper {live-media|bootfrom}=DEVICE
+casper live-media-offset=BYTES
+casper locale=LOCALE | debian-installer/locale=LOCALE
+casper netboot[=nfs|cifs]
+casper persistent
+casper nopersistent
+casper showmounts
+casper todisk=DEVICE
+casper toram
+casper {preseed/file|file}=FILE
+casper package/question=VALUE
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-07-14 17:51:48 UTC (rev 2485)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-07-14 18:03:50 UTC (rev 2486)
@@ -3,6 +3,9 @@
* helpers/lh_binary_debian-installer:
- Addded 'live' mode.
- Fixed a minor typo.
+ * helpers/lh_binary_includes:
+ - Moved copying of parameters.txt to lh_binary_linux-image.
+ - Moved parameters.txt.* to live-initramfs and data/casper.
2007-07-12 Daniel Baumann <daniel at debian.org>
Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-07-14 17:51:48 UTC (rev 2485)
+++ dists/trunk/live-helper/helpers/lh_binary_includes 2007-07-14 18:03:50 UTC (rev 2486)
@@ -160,13 +160,5 @@
sed -i -e "s#DEBIAN_NAME#${DEBIAN_NAME}#g" -e "s/DEBIAN_DATE/${DEBIAN_DATE}/g" -e "s#DEBIAN_TOOLS#${DEBIAN_TOOLS_TXT}#g" binary/README.txt
fi
-# Cleaning up includes
-if [ -e binary/parameters.txt.${LH_INITRAMFS} ]
-then
- mv binary/parameters.txt.${LH_INITRAMFS} binary/parameters.txt
-fi
-
-rm -f binary/parameters.txt.*
-
# Creating stage file
Create_stagefile .stage/binary_includes
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-14 17:51:48 UTC (rev 2485)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-07-14 18:03:50 UTC (rev 2486)
@@ -98,5 +98,21 @@
cp chroot/boot/"${LINUX}"-* "${DESTDIR}"
cp chroot/boot/initrd.img-* "${DESTDIR}"
+# Including boot parameter documentation
+if [ "${LIVE_BINARY_IMAGES}" != "net" ]
+then
+ DESTDIR="binary"
+fi
+
+case "${LH_INITRAMFS}" in
+ casper)
+ cp "${LH_BASE:-/usr/share/live-helper}"/data/casper/parameters.txt "${DESTDIR}"/parameters.txt
+ ;;
+
+ live-initramfs)
+ cp chroot/usr/share/doc/live-initramfs/parameters.txt "${DESTDIR}"/parameters.txt
+ ;;
+esac
+
# Creating stage file
Create_stagefile .stage/binary_linux-image
Deleted: dists/trunk/live-helper/includes/sid/live/parameters.txt.casper
===================================================================
--- dists/trunk/live-helper/includes/sid/live/parameters.txt.casper 2007-07-14 17:51:48 UTC (rev 2485)
+++ dists/trunk/live-helper/includes/sid/live/parameters.txt.casper 2007-07-14 18:03:50 UTC (rev 2486)
@@ -1,29 +0,0 @@
-Boot Parameters for Debian Live
--------------------------------
-
-Updated for casper 1.77+debian-7 on 2007-02-08.
-
-These options (can be combined) work from the syslinux bootprompt:
-
-casper casper-getty
-casper xdebconf
-casper hostname=HOSTNAME
-casper userfullname=USERFULLNAME
-casper username=USERNAME
-casper {keyb|kbd-chooser/method}=KEYBOARD
-casper {klayout|console-setup/layoutcode}=LAYOUT
-casper {kvariant|console-setup/variantcode}=VARIANT ,
-casper {kmodel|console-setup/modelcode}=CODE , koptions=OPTIONS
-casper ip=IFACE,ADDRESS,NETMASK,GATEWAY[:IFACE,ADDRESS,NETMASK,GATEWAY]*
-casper ip[=frommedia]
-casper {live-media|bootfrom}=DEVICE
-casper live-media-offset=BYTES
-casper locale=LOCALE | debian-installer/locale=LOCALE
-casper netboot[=nfs|cifs]
-casper persistent
-casper nopersistent
-casper showmounts
-casper todisk=DEVICE
-casper toram
-casper {preseed/file|file}=FILE
-casper package/question=VALUE
Deleted: dists/trunk/live-helper/includes/sid/live/parameters.txt.live-initramfs
===================================================================
--- dists/trunk/live-helper/includes/sid/live/parameters.txt.live-initramfs 2007-07-14 17:51:48 UTC (rev 2485)
+++ dists/trunk/live-helper/includes/sid/live/parameters.txt.live-initramfs 2007-07-14 18:03:50 UTC (rev 2486)
@@ -1,47 +0,0 @@
-Boot Parameters for Debian Live
--------------------------------
-
-Updated for live-initramfs 1.91.5-1 on 2007-07-23.
-
-These options (can be combined) work from the syslinux bootprompt:
-
-live access=ACCESS
-live console=TTY,SPEED
-live debug
-live hostname=HOSTNAME
-live username=USER
-live userfullname=USERFULLNAME
-live integrity-check
-live ip=[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF] [,[CLIENT_IP]:[SERVER_IP]:[GATEWAY_IP]:[NETMASK]:[HOSTNAME]:[DEVICE]:[AUTOCONF]]*
-live ip[=frommedia]
-live {keyb|kbd-chooser/method}=KEYBOARD
-live {klayout|console-setup/layoutcode}=LAYOUT
-live {kvariant|console-setup/variantcode}=VARIANT
-live {kmodel|console-setup/modelcode}=CODE
-live koptions=OPTIONS
-live live-getty
-live {live-media|bootfrom}=DEVICE
-live {live-media-encryption|encryption}=TYPE
-live live-media-offset=BYTES
-live live-media-timeout=SECONDS
-live {locale|debian-installer/locale}=LOCALE
-live module=NAME
-live netboot[=nfs|cifs]
-live nfsopts=
-live noautologin
-live noxautologin
-live nofastboot
-live nopersistent
-live nosudo
-live noswap
-live persistent
-live {preseed/file|file}=FILE
-live package/question=VALUE
-live quickreboot
-live showmounts
-live timezone=TIMEZONE
-live todisk=DEVICE
-live toram
-live union=unionfs|aufs
-live xdebconf
-live xvideomode=RESOLUTION
More information about the Debian-live-changes
mailing list