[Debian-live-changes] r1149 - in dists/trunk/live-helper: doc helpers

Daniel Baumann daniel at alioth.debian.org
Tue Apr 24 07:41:47 UTC 2007


Author: daniel
Date: 2007-04-24 07:41:47 +0000 (Tue, 24 Apr 2007)
New Revision: 1149

Modified:
   dists/trunk/live-helper/doc/FAQ
   dists/trunk/live-helper/helpers/lh_binary_chroot
   dists/trunk/live-helper/helpers/lh_binary_rootfs
   dists/trunk/live-helper/helpers/lh_chroot
   dists/trunk/live-helper/helpers/lh_chroot_hacks
   dists/trunk/live-helper/helpers/make-live
Log:


Modified: dists/trunk/live-helper/doc/FAQ
===================================================================
--- dists/trunk/live-helper/doc/FAQ	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/doc/FAQ	2007-04-24 07:41:47 UTC (rev 1149)
@@ -10,6 +10,15 @@
    include it.
 
 
+Q: How can I build images with an unprevileged user account?
+A: You can use --root-command sudo or set LH_ROOT_COMMAND="sudo" in
+   config/common.
+
+   *BIG* *FAT* *WARNING*: Building an image as non-root can make your image
+   different compared to a regular Debian system. It is *NOT* recommended to
+   build images as non-root.
+
+
 Q: How do I drop in to a shell during make-live chroot process?
 A: Use "--interactive shell", then exit with 'logout' when you have made the
    setting changes you want and the build process will continue.
@@ -24,6 +33,7 @@
    --hostname to make-live, or alter LIVE_USERNAME and LIVE_HOSTNAME in
    config/image.
 
+
 Q: How can I make my own grub bootsplash?
 A: To add a grub splash screen, you can use --grub-splash FILE, or copy your
    custom splash to config/binary_grub/splash.xpm.gz.
@@ -31,6 +41,7 @@
    Documentation about creating a bootsplash for grub can be found at:
    <http://ruslug.rutgers.edu/~mcgrof/grub-images/>
 
+
 Q: How can I make my own syslinux bootsplash?
 A: To add a syslinux splash screen, you can use --syslinux-splash FILE, or copy
    your custom splash to config/binary_syslinux/splash.rle.

Modified: dists/trunk/live-helper/helpers/lh_binary_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_chroot	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/helpers/lh_binary_chroot	2007-04-24 07:41:47 UTC (rev 1149)
@@ -65,5 +65,10 @@
 ${LH_ROOT_COMMAND} cp -a chroot chroot.tmp
 ${LH_ROOT_COMMAND} mv chroot.tmp chroot/chroot
 
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown `whoami`:`whoami` chroot -R
+fi
+
 # Creating stage file
 Create_stagefile .stage/binary_chroot

Modified: dists/trunk/live-helper/helpers/lh_binary_rootfs
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/helpers/lh_binary_rootfs	2007-04-24 07:41:47 UTC (rev 1149)
@@ -120,9 +120,14 @@
 		fi
 
 		# Move image
-		mv chroot/filesystem.squashfs binary/casper
-		rm -rf chroot/chroot
+		${LH_ROOT_COMMAND} mv chroot/filesystem.squashfs binary/casper
+		${LH_ROOT_COMMAND} rm -rf chroot/chroot
 
+		if [ -n "${LH_ROOT_COMMAND}" ]
+		then
+			${LH_ROOT_COMMAND} chown `whoami`:`whoami` binary/casper -R
+		fi
+
 		# Removing depends
 		Remove_package
 		;;

Modified: dists/trunk/live-helper/helpers/lh_chroot
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/helpers/lh_chroot	2007-04-24 07:41:47 UTC (rev 1149)
@@ -51,12 +51,12 @@
 lh_chroot_localpackages "${@}"
 lh_chroot_localpackageslists "${@}"
 lh_chroot_localization "${@}"
-lh_chroot_hacks "${@}"
 lh_chroot_localincludes "${@}"
 lh_chroot_sysvinit "${@}"
 lh_chroot_hooks "${@}"
 lh_chroot_localhooks "${@}"
 lh_chroot_symlinks "${@}"
+lh_chroot_hacks "${@}"
 lh_chroot_interactive "${@}"
 
 # Deconfiguring chroot

Modified: dists/trunk/live-helper/helpers/lh_chroot_hacks
===================================================================
--- dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/helpers/lh_chroot_hacks	2007-04-24 07:41:47 UTC (rev 1149)
@@ -82,5 +82,10 @@
 # Update initramfs
 Chroot "update-initramfs -k all -t -u"
 
+if [ -n "${LH_ROOT_COMMAND}" ]
+then
+	${LH_ROOT_COMMAND} chown `whoami`:`whoami` chroot -R
+fi
+
 # Creating stage file
 Create_stagefile .stage/chroot_hacks

Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live	2007-04-24 07:18:12 UTC (rev 1148)
+++ dists/trunk/live-helper/helpers/make-live	2007-04-24 07:41:47 UTC (rev 1149)
@@ -37,7 +37,7 @@
 
 Local_arguments ()
 {
-	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
+	ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,apt-generic:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-build:,mirror-build-security:,mirror-image:,mirror-image-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-image:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`"
 
 	if [ "${?}" != "0" ]
 	then




More information about the Debian-live-changes mailing list