manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing --username cruft, live-config bootparameters should be used via --bootappend-live.

This commit is contained in:
Daniel Baumann 2012-02-26 19:55:28 +01:00
parent ea22359fa6
commit 7809c0ef96
11 changed files with 517 additions and 651 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
functions/defaults.sh
View File

@ -1181,21 +1181,6 @@ Set_defaults ()
;;
esac
# Setting username
case "${LB_MODE}" in
ubuntu)
LB_USERNAME="${LB_USERNAME:-ubuntu}"
;;
kubuntu)
LB_USERNAME="${LB_USERNAME:-ubuntu}"
;;
*)
LB_USERNAME="${LB_USERNAME:-user}"
;;
esac
# Setting swap file
LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}"

4
manpages/de/lb_config.de.1
View File

@ -238,8 +238,6 @@
[\fB\-\-backports\fP true|false]
.br
[\fB\-\-exposed\-root\fP true|false]
.br
[\fB\-\-username\fP \fINAME\fP]
.br
[\fB\-\-verbose\fP]
.br
@ -766,8 +764,6 @@ or not.
defines whether to expose the root filesystem as read only and not covered
by the union filesystem. This has useful implications for certain speciality
setups such as LTSP. By default, this option is false.
.IP "\fB\-\-username\fP \fINAME\fP" 4
sets the name of the account of the default user in the live system.
.IP \fB\-\-verbose\fP 4
increases the verbosity of messages output by \fBlb build\fP.
.IP "\fB\-\-win32\-loader true|false\fP" 4

4
manpages/en/lb_config.1
View File

@ -232,8 +232,6 @@
[\fB\-\-backports\fR true|false]
.br
[\fB\-\-exposed\-root\fR true|false]
.br
[\fB\-\-username\fR \fINAME\fR]
.br
[\fB\-\-verbose\fR]
.br
@ -486,8 +484,6 @@ defines if debian volatile package archives should be included in the image or n
defines if debian backports package archives should be included in the image or not.
.IP "\fB\-\-exposed\-root\fR true|false" 4
defines whether to expose the root filesystem as read only and not covered by the union filesystem. This has useful implications for certain speciality setups such as LTSP. By default, this option is false.
.IP "\fB\-\-username\fR \fINAME\fR" 4
sets the name of the account of the default user in the live system.
.IP "\fB\-\-verbose\fR" 4
increases the verbosity of messages output by \fBlb build\fR.
.IP "\fB\-\-win32\-loader true|false" 4

532
manpages/po/de/lb_config.1.po
View File

File diff suppressed because it is too large Load Diff

532
manpages/pot/lb_config.1.pot
View File

File diff suppressed because it is too large Load Diff

16
scripts/build/lb_binary_grub
View File

@ -164,22 +164,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LB_USERNAME}" ]
then
case "${LB_INITRAMFS}" in
casper)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-boot)
if [ "${LB_USERNAME}" != "user" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"

16
scripts/build/lb_binary_grub2
View File

@ -138,22 +138,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LB_USERNAME}" ]
then
case "${LB_INITRAMFS}" in
casper)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-boot)
if [ "${LB_USERNAME}" != "user" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"

16
scripts/build/lb_binary_silo
View File

@ -128,22 +128,6 @@ esac
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LB_USERNAME}" ]
then
case "${LB_INITRAMFS}" in
casper)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-boot)
if [ "${LB_USERNAME}" != "user" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"

16
scripts/build/lb_binary_yaboot
View File

@ -170,22 +170,6 @@ Check_multiarchitectures
mkdir -p "${DESTDIR_LIVE}"
# Setting boot parameters
if [ -n "${LB_USERNAME}" ]
then
case "${LB_INITRAMFS}" in
casper)
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
;;
live-boot)
if [ "${LB_USERNAME}" != "user" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} username=${LB_USERNAME}"
fi
;;
esac
fi
if [ "${LB_UNION_FILESYSTEM}" != "aufs" ]
then
LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE} union=${LB_UNION_FILESYSTEM}"

5
scripts/build/lb_chroot_hacks
View File

@ -246,11 +246,6 @@ case "${LB_INITRAMFS}" in
;;
esac
if [ -d chroot/home/${LB_USERNAME} ] && [ "${ID}" ]
then
chown -R --quiet ${ID}:${ID} chroot/home/${LB_USERNAME}
fi
if [ "${LB_DEBIAN_INSTALLER}" = "live" ]
then
# This is a temporary hack to get rid of fstab;

12
scripts/build/lb_config
View File

@ -143,7 +143,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
\t [--volatile true|false]\n\
\t [--backports true|false]\n\
\t [--exposed-root true|false]\n\
\t [--username NAME]\n\
\t [--verbose]\n\
\t [--win32-loader true|false]\n\
\t [--bootstrap-qemu-exclude PACKAGES]\n\
@ -171,7 +170,7 @@ Local_arguments ()
iso-volume:,jffs2-eraseblock:,memtest:,net-root-filesystem:,net-root-mountoptions:,
net-root-path:,net-root-server:,net-cow-filesystem:,net-cow-mountoptions:,net-cow-path:,
net-cow-server:,net-tarball:,swap-file-path:,swap-file-size:,syslinux-theme:,
username:,win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
win32-loader:,source:,source-images:,breakpoints,conffile:,debug,force,
help,ignore-system-defaults,quiet,usage,verbose,version,bootstrap-qemu-static:,bootstrap-qemu-arch:,
bootstrap-qemu-exclude:"
# Remove spaces added by indentation
@ -764,11 +763,6 @@ Local_arguments ()
shift 2
;;
--username)
LB_USERNAME="${2}"
shift 2
;;
--win32-loader)
LB_WIN32_LOADER="${2}"
shift 2
@ -1410,10 +1404,6 @@ LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE}"
# \$LB_SYSLINUX_THEME: set syslinux theme package
# (Default: ${LB_SYSLINUX_THEME})
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME}"
# \$LB_USERNAME: set username
# (Default: ${LB_USERNAME})
LB_USERNAME="${LB_USERNAME}"
EOF
# Creating lb_source_* configuration