From 9f8c8c3c1f7c8f351e56752fe3de8c23c7975c49 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Tue, 8 Jun 2010 18:46:50 +0200 Subject: [PATCH] Removing xconfig, xdriver, and xvideomode scripts, live-config takes care about that now. --- manpages/de/live-boot.de.7 | 13 +--- manpages/en/live-boot.7 | 8 --- manpages/po/de/live-boot.7.po | 138 +++++++++++++--------------------------- manpages/pot/live-boot.7.pot | 138 +++++++++++++--------------------------- scripts/live | 25 +------- scripts/live-bottom/20xconfig | 121 ----------------------------------- scripts/live-bottom/21xdriver | 56 ---------------- scripts/live-bottom/21xvidemode | 55 ---------------- 8 files changed, 90 insertions(+), 464 deletions(-) delete mode 100755 scripts/live-bottom/20xconfig delete mode 100755 scripts/live-bottom/21xdriver delete mode 100755 scripts/live-bottom/21xvidemode diff --git a/manpages/de/live-boot.de.7 b/manpages/de/live-boot.de.7 index 9426cb8..90d14ea 100644 --- a/manpages/de/live-boot.de.7 +++ b/manpages/de/live-boot.de.7 @@ -158,10 +158,6 @@ has been installed with persistent enabled. Do not prompt to eject the CD or remove the USB flash drive on reboot. .IP \fBswapon\fP 4 This parameter enables usage of local swap partitions. -.IP \fBnoxautoconfig\fP 4 -This parameter disables Xorg auto\-reconfiguration at boot time. This is -valuable if you either do the detection on your own, or, if you want to ship -a custom, premade xorg.conf in your live system. .IP \fBpersistent\fP[=nofiles] 4 live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try @@ -194,8 +190,6 @@ installation. .IP \fBsilent\fP 4 If you boot with the normal quiet parameter, live\-boot hides most messages of its own. When adding silent, it hides all. -.IP \fBtextonly\fP 4 -Start up to text\-mode shell prompts, disabling the graphical user interface. .IP \fBtodisk\fP=\fIDEVICE\fP 4 Adding this parameter, live\-boot will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably @@ -207,14 +201,9 @@ Adding this parameter, live\-boot will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media. .IP \fBunion\fP=aufs|unionfs 4 +.\" FIXME By default, live\-boot uses aufs. With this parameter, you can switch to unionfs. -.IP \fBxdebconf\fP 4 -Uses xdebconfigurator, if present on the rootfs, to configure X instead of -the standard procedure (experimental). -.IP \fBxvideomode\fP=\fIRESOLUTION\fP 4 -.\" FIXME -Doesn't do xorg autodetection, but enforces a given resolution. .\" FIXME .SH "FILES (old)" diff --git a/manpages/en/live-boot.7 b/manpages/en/live-boot.7 index 9097ca7..2e74e1b 100644 --- a/manpages/en/live-boot.7 +++ b/manpages/en/live-boot.7 @@ -98,8 +98,6 @@ disables the "persistent" feature, useful if the bootloader (like syslinux) has Do not prompt to eject the CD or remove the USB flash drive on reboot. .IP "\fBswapon\fR" 4 This parameter enables usage of local swap partitions. -.IP "\fBnoxautoconfig\fR" 4 -This parameter disables Xorg auto\-reconfiguration at boot time. This is valuable if you either do the detection on your own, or, if you want to ship a custom, premade xorg.conf in your live system. .IP "\fBpersistent\fR[=nofiles]" 4 live\-boot will look for persistent and snapshot partitions or files labeled "live\-rw", "home\-rw", and files called "live\-sn*", "home\-sn*" and will try to, in order: mount as /cow the first, mount the second in /home, and just copy the contents of the latter in appropriate locations (snapshots). Snapshots will be tried to be updated on reboot/shutdown. Look at live\-snapshot(1) for more informations. If "nofiles" is specified, only filesystems with matching labels will be searched; no filesystems will be traversed looking for archives or image files. This results in shorter boot times. .IP "\fBpersistent\-path\fR=\fIPATH\fR" 4 @@ -114,18 +112,12 @@ This option causes live\-boot to reboot without attempting to eject the media an This parameter will make live\-boot to show on "/" the ro filesystems (mostly compressed) on "/live". This is not enabled by default because could lead to problems by applications like "mono" which store binary paths on installation. .IP "\fBsilent\fR" 4 If you boot with the normal quiet parameter, live\-boot hides most messages of its own. When adding silent, it hides all. -.IP "\fBtextonly\fR" 4 -Start up to text\-mode shell prompts, disabling the graphical user interface. .IP "\fBtodisk\fR=\fIDEVICE\fR" 4 Adding this parameter, live\-boot will try to copy the entire read\-only media to the specified device before mounting the root filesystem. It probably needs a lot of free space. Subsequent boots should then skip this step and just specify the "live\-media=DEVICE" boot parameter with the same DEVICE used this time. .IP "\fBtoram\fR" 4 Adding this parameter, live\-boot will try to copy the whole read\-only media to the computer's RAM before mounting the root filesystem. This could need a lot of ram, according to the space used by the read\-only media. .IP "\fBunion\fR=aufs|unionfs\fR" 4 By default, live\-boot uses aufs. With this parameter, you can switch to unionfs. -.IP "\fBxdebconf\fR" 4 -Uses xdebconfigurator, if present on the rootfs, to configure X instead of the standard procedure (experimental). -.IP "\fBxvideomode\fR=\fIRESOLUTION\fR" 4 -Doesn't do xorg autodetection, but enforces a given resolution. .\" FIXME .\" FIXME diff --git a/manpages/po/de/live-boot.7.po b/manpages/po/de/live-boot.7.po index a91c967..41fd252 100644 --- a/manpages/po/de/live-boot.7.po +++ b/manpages/po/de/live-boot.7.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot 2.0~a6\n" -"POT-Creation-Date: 2010-06-08 16:12+0300\n" +"POT-Creation-Date: 2010-06-08 18:50+0300\n" "PO-Revision-Date: 2010-05-24 12:34+0300\n" "Last-Translator: Daniel Baumann \n" "Language-Team: none\n" @@ -509,25 +509,11 @@ msgstr "" #. type: IP #: en/live-boot.7:101 #, no-wrap -msgid "B" -msgstr "B" - -#. type: Plain text -#: en/live-boot.7:103 -msgid "" -"This parameter disables Xorg auto-reconfiguration at boot time. This is " -"valuable if you either do the detection on your own, or, if you want to ship " -"a custom, premade xorg.conf in your live system." -msgstr "" - -#. type: IP -#: en/live-boot.7:103 -#, no-wrap msgid "B[=nofiles]" msgstr "B[=nofiles]" #. type: Plain text -#: en/live-boot.7:105 +#: en/live-boot.7:103 msgid "" "live-boot will look for persistent and snapshot partitions or files labeled " "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and " @@ -541,13 +527,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:105 +#: en/live-boot.7:103 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:105 msgid "" "live-boot will look for persistency files in the root directory of a " "partition, with this parameter, the path can be configured so that you can " @@ -555,26 +541,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:105 #, no-wrap msgid "{B|B}=I" msgstr "{B|B}=I" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:107 msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:107 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:111 +#: en/live-boot.7:109 msgid "" "All debian installed packages could be preseeded from command-line that way, " "beware of blanks spaces, they will interfere with parsing, use a preseed " @@ -582,26 +568,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:109 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:111 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:113 +#: en/live-boot.7:111 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:113 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -610,38 +596,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:113 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:115 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:117 -#, no-wrap -msgid "B" -msgstr "B" - -#. type: Plain text -#: en/live-boot.7:119 -msgid "" -"Start up to text-mode shell prompts, disabling the graphical user interface." -msgstr "" - -#. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:115 #, no-wrap msgid "B=I" msgstr "B=I" #. type: Plain text -#: en/live-boot.7:121 +#: en/live-boot.7:117 msgid "" "Adding this parameter, live-boot will try to copy the entire read-only media " "to the specified device before mounting the root filesystem. It probably " @@ -651,13 +625,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:117 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:123 +#: en/live-boot.7:119 msgid "" "Adding this parameter, live-boot will try to copy the whole read-only media " "to the computer's RAM before mounting the root filesystem. This could need a " @@ -665,71 +639,47 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:123 +#: en/live-boot.7:119 #, no-wrap msgid "B=aufs|unionfs" msgstr "B=aufs|unionfs" +#. FIXME #. type: Plain text -#: en/live-boot.7:125 +#: en/live-boot.7:122 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." msgstr "" -#. type: IP -#: en/live-boot.7:125 -#, no-wrap -msgid "B" -msgstr "B" - -#. type: Plain text -#: en/live-boot.7:127 -msgid "" -"Uses xdebconfigurator, if present on the rootfs, to configure X instead of " -"the standard procedure (experimental)." -msgstr "" - -#. type: IP -#: en/live-boot.7:127 -#, no-wrap -msgid "B=I" -msgstr "B=I" - -#. FIXME -#. type: Plain text -#: en/live-boot.7:130 -msgid "Doesn't do xorg autodetection, but enforces a given resolution." -msgstr "" - #. FIXME #. type: SH -#: en/live-boot.7:132 +#: en/live-boot.7:124 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:133 en/live-snapshot.1:43 +#: en/live-boot.7:125 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:45 +#: en/live-boot.7:127 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:135 en/live-snapshot.1:45 +#: en/live-boot.7:127 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:137 en/live-snapshot.1:47 +#: en/live-boot.7:129 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -742,13 +692,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:137 en/live-snapshot.1:47 +#: en/live-boot.7:129 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "B" #. type: Plain text -#: en/live-boot.7:139 en/live-snapshot.1:49 +#: en/live-boot.7:131 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -757,7 +707,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:142 en/live-snapshot.1:51 +#: en/live-boot.7:134 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -766,64 +716,64 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:42 +#: en/live-boot.7:135 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "DATEIEN" #. type: IP -#: en/live-boot.7:144 +#: en/live-boot.7:136 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:145 +#: en/live-boot.7:137 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:146 +#: en/live-boot.7:138 #, no-wrap msgid "B" msgstr "B" #. type: IP -#: en/live-boot.7:147 +#: en/live-boot.7:139 #, no-wrap msgid "B" msgstr "B" #. type: SH -#: en/live-boot.7:149 en/live-snapshot.1:52 +#: en/live-boot.7:141 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "SIEHE AUCH" #. type: Plain text -#: en/live-boot.7:151 +#: en/live-boot.7:143 msgid "I(1)" msgstr "I(1)" #. type: Plain text -#: en/live-boot.7:153 en/live-snapshot.1:56 +#: en/live-boot.7:145 en/live-snapshot.1:56 msgid "I(7)" msgstr "I(7)" #. type: Plain text -#: en/live-boot.7:155 en/live-snapshot.1:58 +#: en/live-boot.7:147 en/live-snapshot.1:58 msgid "I(7)" msgstr "I(7)" #. type: SH -#: en/live-boot.7:156 en/live-snapshot.1:59 +#: en/live-boot.7:148 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "HOMEPAGE" #. type: Plain text -#: en/live-boot.7:158 en/live-snapshot.1:61 +#: en/live-boot.7:150 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -834,13 +784,13 @@ msgstr "" "unter EIE gefunden werden." #. type: SH -#: en/live-boot.7:159 en/live-snapshot.1:62 +#: en/live-boot.7:151 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "FEHLER" #. type: Plain text -#: en/live-boot.7:161 en/live-snapshot.1:64 +#: en/live-boot.7:153 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -854,13 +804,13 @@ msgstr "" "werden." #. type: SH -#: en/live-boot.7:162 en/live-snapshot.1:65 +#: en/live-boot.7:154 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text -#: en/live-boot.7:163 en/live-snapshot.1:66 +#: en/live-boot.7:155 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/manpages/pot/live-boot.7.pot b/manpages/pot/live-boot.7.pot index a129f08..d630ac1 100644 --- a/manpages/pot/live-boot.7.pot +++ b/manpages/pot/live-boot.7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: live-boot VERSION\n" -"POT-Creation-Date: 2010-06-08 16:12+0300\n" +"POT-Creation-Date: 2010-06-08 18:50+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -503,25 +503,11 @@ msgstr "" #. type: IP #: en/live-boot.7:101 #, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: en/live-boot.7:103 -msgid "" -"This parameter disables Xorg auto-reconfiguration at boot time. This is " -"valuable if you either do the detection on your own, or, if you want to ship " -"a custom, premade xorg.conf in your live system." -msgstr "" - -#. type: IP -#: en/live-boot.7:103 -#, no-wrap msgid "B[=nofiles]" msgstr "" #. type: Plain text -#: en/live-boot.7:105 +#: en/live-boot.7:103 msgid "" "live-boot will look for persistent and snapshot partitions or files labeled " "\"live-rw\", \"home-rw\", and files called \"live-sn*\", \"home-sn*\" and " @@ -535,13 +521,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:105 +#: en/live-boot.7:103 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:107 +#: en/live-boot.7:105 msgid "" "live-boot will look for persistency files in the root directory of a " "partition, with this parameter, the path can be configured so that you can " @@ -549,26 +535,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:107 +#: en/live-boot.7:105 #, no-wrap msgid "{B|B}=I" msgstr "" #. type: Plain text -#: en/live-boot.7:109 +#: en/live-boot.7:107 msgid "" "A path to a file present on the rootfs could be used to preseed debconf " "database." msgstr "" #. type: IP -#: en/live-boot.7:109 +#: en/live-boot.7:107 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:111 +#: en/live-boot.7:109 msgid "" "All debian installed packages could be preseeded from command-line that way, " "beware of blanks spaces, they will interfere with parsing, use a preseed " @@ -576,26 +562,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:111 +#: en/live-boot.7:109 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:113 +#: en/live-boot.7:111 msgid "" "This option causes live-boot to reboot without attempting to eject the media " "and without asking the user to remove the boot media." msgstr "" #. type: IP -#: en/live-boot.7:113 +#: en/live-boot.7:111 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:115 +#: en/live-boot.7:113 msgid "" "This parameter will make live-boot to show on \"/\" the ro filesystems " "(mostly compressed) on \"/live\". This is not enabled by default because " @@ -604,38 +590,26 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:115 +#: en/live-boot.7:113 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:117 +#: en/live-boot.7:115 msgid "" "If you boot with the normal quiet parameter, live-boot hides most messages " "of its own. When adding silent, it hides all." msgstr "" #. type: IP -#: en/live-boot.7:117 -#, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: en/live-boot.7:119 -msgid "" -"Start up to text-mode shell prompts, disabling the graphical user interface." -msgstr "" - -#. type: IP -#: en/live-boot.7:119 +#: en/live-boot.7:115 #, no-wrap msgid "B=I" msgstr "" #. type: Plain text -#: en/live-boot.7:121 +#: en/live-boot.7:117 msgid "" "Adding this parameter, live-boot will try to copy the entire read-only media " "to the specified device before mounting the root filesystem. It probably " @@ -645,13 +619,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:121 +#: en/live-boot.7:117 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:123 +#: en/live-boot.7:119 msgid "" "Adding this parameter, live-boot will try to copy the whole read-only media " "to the computer's RAM before mounting the root filesystem. This could need a " @@ -659,71 +633,47 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:123 +#: en/live-boot.7:119 #, no-wrap msgid "B=aufs|unionfs" msgstr "" +#. FIXME #. type: Plain text -#: en/live-boot.7:125 +#: en/live-boot.7:122 msgid "" "By default, live-boot uses aufs. With this parameter, you can switch to " "unionfs." msgstr "" -#. type: IP -#: en/live-boot.7:125 -#, no-wrap -msgid "B" -msgstr "" - -#. type: Plain text -#: en/live-boot.7:127 -msgid "" -"Uses xdebconfigurator, if present on the rootfs, to configure X instead of " -"the standard procedure (experimental)." -msgstr "" - -#. type: IP -#: en/live-boot.7:127 -#, no-wrap -msgid "B=I" -msgstr "" - -#. FIXME -#. type: Plain text -#: en/live-boot.7:130 -msgid "Doesn't do xorg autodetection, but enforces a given resolution." -msgstr "" - #. FIXME #. type: SH -#: en/live-boot.7:132 +#: en/live-boot.7:124 #, no-wrap msgid "FILES (old)" msgstr "" #. type: IP -#: en/live-boot.7:133 en/live-snapshot.1:43 +#: en/live-boot.7:125 en/live-snapshot.1:43 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:135 en/live-snapshot.1:45 +#: en/live-boot.7:127 en/live-snapshot.1:45 msgid "" "Some variables can be configured via this config file (inside the live " "system)." msgstr "" #. type: IP -#: en/live-boot.7:135 en/live-snapshot.1:45 +#: en/live-boot.7:127 en/live-snapshot.1:45 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:137 en/live-snapshot.1:47 +#: en/live-boot.7:129 en/live-snapshot.1:47 msgid "" "This optional file (inside the live media) contains a list of white-space or " "carriage-return-separated file names corresponding to disk images in the \"/" @@ -736,13 +686,13 @@ msgid "" msgstr "" #. type: IP -#: en/live-boot.7:137 en/live-snapshot.1:47 +#: en/live-boot.7:129 en/live-snapshot.1:47 #, no-wrap msgid "B" msgstr "" #. type: Plain text -#: en/live-boot.7:139 en/live-snapshot.1:49 +#: en/live-boot.7:131 en/live-snapshot.1:49 msgid "" "This optional file (which resides in the rootfs system, not in the live " "media) is used as a list of directories which not need be persistent: ie. " @@ -751,7 +701,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/live-boot.7:142 en/live-snapshot.1:51 +#: en/live-boot.7:134 en/live-snapshot.1:51 msgid "" "This saves expensive writes and speeds up operations on volatile data such " "as web caches and temporary files (like e.g. /tmp and .mozilla) which are " @@ -760,64 +710,64 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:143 en/live-snapshot.1:42 +#: en/live-boot.7:135 en/live-snapshot.1:42 #, no-wrap msgid "FILES" msgstr "" #. type: IP -#: en/live-boot.7:144 +#: en/live-boot.7:136 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:145 +#: en/live-boot.7:137 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:146 +#: en/live-boot.7:138 #, no-wrap msgid "B" msgstr "" #. type: IP -#: en/live-boot.7:147 +#: en/live-boot.7:139 #, no-wrap msgid "B" msgstr "" #. type: SH -#: en/live-boot.7:149 en/live-snapshot.1:52 +#: en/live-boot.7:141 en/live-snapshot.1:52 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: en/live-boot.7:151 +#: en/live-boot.7:143 msgid "I(1)" msgstr "" #. type: Plain text -#: en/live-boot.7:153 en/live-snapshot.1:56 +#: en/live-boot.7:145 en/live-snapshot.1:56 msgid "I(7)" msgstr "" #. type: Plain text -#: en/live-boot.7:155 en/live-snapshot.1:58 +#: en/live-boot.7:147 en/live-snapshot.1:58 msgid "I(7)" msgstr "" #. type: SH -#: en/live-boot.7:156 en/live-snapshot.1:59 +#: en/live-boot.7:148 en/live-snapshot.1:59 #, no-wrap msgid "HOMEPAGE" msgstr "" #. type: Plain text -#: en/live-boot.7:158 en/live-snapshot.1:61 +#: en/live-boot.7:150 en/live-snapshot.1:61 msgid "" "More information about live-boot and the Debian Live project can be found on " "the homepage at EIE and in the manual at " @@ -825,13 +775,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:159 en/live-snapshot.1:62 +#: en/live-boot.7:151 en/live-snapshot.1:62 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: en/live-boot.7:161 en/live-snapshot.1:64 +#: en/live-boot.7:153 en/live-snapshot.1:64 msgid "" "Bugs can be reported by submitting a bugreport for the live-boot package in " "the Debian Bug Tracking System at EIE or by " @@ -840,13 +790,13 @@ msgid "" msgstr "" #. type: SH -#: en/live-boot.7:162 en/live-snapshot.1:65 +#: en/live-boot.7:154 en/live-snapshot.1:65 #, no-wrap msgid "AUTHOR" msgstr "" #. type: Plain text -#: en/live-boot.7:163 en/live-snapshot.1:66 +#: en/live-boot.7:155 en/live-snapshot.1:66 msgid "" "live-boot was written by Daniel Baumann EIE for " "the Debian project." diff --git a/scripts/live b/scripts/live index 6f04b86..37c3abd 100755 --- a/scripts/live +++ b/scripts/live @@ -51,14 +51,11 @@ Arguments () case "${ARGUMENT}" in skipconfig) NOACCESSIBILITY="Yes" - NOAUTOLOGIN="Yes" - NOCONSOLEKEYBOARD="Yes" NOFASTBOOT="Yes" NOFSTAB="Yes" NONETWORKING="Yes" - NOXAUTOCONFIG="Yes" - export NOACCESSIBILITY NOAUTOLOGIN NOCONSOLEKEYBOARD NOFASTBOOT NOFSTAB NONETWORKING NOXAUTOCONFIG + export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING ;; access=*) @@ -243,11 +240,6 @@ Arguments () export SWAPON ;; - noxautoconfig) - NOXAUTOCONFIG="Yes" - export NOXAUTOCONFIG - ;; - persistent) PERSISTENT="Yes" export PERSISTENT @@ -351,21 +343,6 @@ Arguments () UNIONTYPE="${ARGUMENT#union=}" export UNIONTYPE ;; - - xdebconf) - XDEBCONF="Yes" - export XDEBCONF - ;; - - xdriver=*) - XDRIVER="${ARGUMENT#xdriver=}" - export XDRIVER - ;; - - xvideomode=*) - XVIDEOMODE="${ARGUMENT#xvideomode=}" - export XVIDEOMODE - ;; esac done diff --git a/scripts/live-bottom/20xconfig b/scripts/live-bottom/20xconfig deleted file mode 100755 index abd9661..0000000 --- a/scripts/live-bottom/20xconfig +++ /dev/null @@ -1,121 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -if [ -n "${NOXAUTOCONFIG}" ] -then - exit 0 -fi - -. /scripts/live-functions - -# live-boot script - -if [ -n "${TEXTONLY}" ] -then - exit 0 -fi - -if [ ! -x /root/usr/bin/X ] -then - exit 0 -fi - -log_begin_msg "Configuring X" - -if ! grep -q xforcevesa /proc/cmdline 2>&1 >/dev/null -then - if [ "${TERM_TYPE}" = "serial" ] - then - # Don't bother trying to configure or start X on a serial - # console - rm -f /root/etc/rc?.d/S??[gkx]dm - exit 0 - fi - - locale=en_US.UTF-8 - - mount -o bind /sys /root/sys - mount -o bind /proc /root/proc - mount -o bind /dev /root/dev - - if [ -n "${XDEBCONF}" -a -x /root/usr/sbin/xdebconfigurator ] - then - # xdebconfigurator - chroot /root /usr/sbin/xdebconfigurator - fi - - if [ -n "${KOPTIONS}" ] - then - setoptions="set xserver-xorg/config/inputdevice/keyboard/options ${KOPTIONS}" - fi - - if [ -n "${KVARIANT}" ] - then - setvariant="set xserver-xorg/config/inputdevice/keyboard/variant ${KVARIANT}" - fi - - if [ -n "${KMODEL}" ] - then - setmodel="set xserver-xorg/config/inputdevice/keyboard/model ${KMODEL}" - fi - - if [ -n "${KLAYOUT}" ] - then - setlayout="set xserver-xorg/config/inputdevice/keyboard/layout ${KLAYOUT}" - fi - -chroot /root debconf-communicate -fnoninteractive live-boot > /dev/null << EOF -${setlayout} -${setvariant} -${setmodel} -${setoptions} -EOF - - live-reconfigure /root xserver-xorg 2>&1 \ - | grep -v "overwriting possibly-customised configuration" \ - | grep -v "file; backup in /etc/X11/xorg.conf" - - umount /root/sys - umount /root/proc - umount /root/dev -else - -cat > /root/etc/X11/xorg.conf << EOF -Section "Device" - Identifier "Configured Video Device" - Driver "vesa" -EndSection - -Section "Monitor" - Identifier "Configured Monitor" -EndSection - -Section "Screen" - Identifier "Default Screen" - Monitor "Configured Monitor" - Device "Configured Video Device" -EndSection -EOF - -fi - -log_end_msg diff --git a/scripts/live-bottom/21xdriver b/scripts/live-bottom/21xdriver deleted file mode 100755 index 92bbd4f..0000000 --- a/scripts/live-bottom/21xdriver +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -if [ -n "${NOXAUTOCONFIG}" ] || [ ! -x /root/usr/bin/X ] || [ -z "${XDRIVER}" ] -then - exit 0 -fi - -. /scripts/live-functions - -log_begin_msg "Configuring X video driver" - -# live-boot script - -. /live.vars - -mount -o bind /sys /root/sys -mount -o bind /proc /root/proc -mount -o bind /dev /root/dev - -if [ "${XDRIVER}" != "dexconf" ] -then - -chroot /root debconf-communicate -fnoninteractive live-boot > /dev/null << EOF -set xserver-xorg/autodetect_video_card false -set xserver-xorg/config/device/driver ${XDRIVER} -EOF - -fi - -chroot /root dexconf - -umount /root/sys -umount /root/proc -umount /root/dev - -log_end_msg diff --git a/scripts/live-bottom/21xvidemode b/scripts/live-bottom/21xvidemode deleted file mode 100755 index ac28fad..0000000 --- a/scripts/live-bottom/21xvidemode +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -#set -e - -# initramfs-tools header - -PREREQ="" - -prereqs() -{ - echo "${PREREQ}" -} - -case "${1}" in - prereqs) - prereqs - exit 0 - ;; -esac - -# live-boot header - -if [ -n "${NOXAUTOCONFIG}" ] -then - exit 0 -fi - -if [ ! -x /root/usr/bin/X ] -then - exit 0 -fi - -[ -n "$XVIDEOMODE" ] || exit - -. /scripts/live-functions - -log_begin_msg "Configuring X video modes" - -# live-boot script - -. /live.vars - -if [ "${XVIDEOMODE}" = "auto" ] -then - rm -f /root/etc/X11/Xsession.d/21xvidemode - - exit 0 -fi - -if [ -x "$(which xrandr 2>/dev/null)" ] -then - echo "xrandr -s ${XVIDEOMODE} || /bin/true" >> /root/etc/X11/Xsession.d/21xvidemode -fi - -log_end_msg -- 2.11.4.GIT