Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=fwlive.git;a=commitdiff;h=9ebda4cba3893fc69fcd18276ef1c0e5876d9814
commit 9ebda4cba3893fc69fcd18276ef1c0e5876d9814
Author: Janny <[EMAIL PROTECTED]>
Date: Sun Mar 9 10:31:14 2008 +0100
fwlive-fwliverc
* add fwliverc file
diff --git a/Makefile b/Makefile
index caf3469..aa74c9b 100644
--- a/Makefile
+++ b/Makefile
@@ -20,9 +20,9 @@ endif
# needed files (files that we can't live without)
NEED_FILES = fstab-update parse_cmdline.in xorg.conf.in rc.fsupd \
crypt.c rc.fwlive rc.config configsave fileswap reboot.diff services.diff
rc.S.diff \
- rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst
+ rc.parse_cmdline parse_cmdline xstart xorg.conf menu.lst fwliverc
INST_FILES_755 = /etc/rc.d/rc.fwlive /etc/rc.d/rc.config /etc/rc.d/rc.fsupd
/usr/local/bin/configsave \
- /usr/local/bin/fileswap /usr/local/bin/fstab-update
/usr/local/bin/xstart \
+ /usr/local/bin/fileswap /usr/local/bin/fstab-update
/usr/local/bin/xstart /usr/local/bin/fwliverc \
/usr/local/bin/parse_cmdline /etc/rc.d/rc.parse_cmdline
/tmp/live-base/tools/fpm2lzm
INST_FILES_644 = /etc/X11/xorg.conf /boot/grub/menu.lst
PWD = $(shell pwd)
@@ -276,6 +276,7 @@ endif
sed -i "s|Live|$(shell ${FWLREL}) (${FWLCODENAME})|"
${CHROOTDIR}/${TREE}/tmp/live-base/cd-root/linux/make_iso.sh
sed -i "s|KERNEL=.*|KERNEL=\"$(shell ${KERNVER})\"|"
${CHROOTDIR}/${TREE}/tmp/live-base/.config
echo "LOCALE=${LOCALE},en" >> ${CHROOTDIR}/${TREE}/tmp/live-base/.config
+ echo "/usr/local/bin/fwliverc" >> ${CHROOTDIR}/${TREE}/etc/rc.d/rc.local
hacking-kdmrc: checkroot
if [ ${APPSGROUP} == "KDE" ] || [ ${APPSGROUP} == "FULL" ] ; then \
diff --git a/fwliverc b/fwliverc
new file mode 100644
index 0000000..60bb163
--- /dev/null
+++ b/fwliverc
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# (c) 2007 Miklos Vajna <[EMAIL PROTECTED]>
+# (c) 2008 Janos Kovacs <[EMAIL PROTECTED]>
+# parse_cmdline for Frugalware
+# distributed under GPL License
+
+. /usr/local/bin/liblinuxlive
+
+# change password
+NEWROOTPASS="`cmdline_value passwd`"
+if [ "$NEWROOTPASS" = "ask" ]; then
+ echo -ne "\nEnter new password for root: "
+ read -s NEWROOTPASS
+fi
+
+if [ ! "$NEWROOTPASS" = "" ]; then
+ echo "root:$NEWROOTPASS" | /usr/sbin/chpasswd
+fi
+
+# debug
+#if grep debug /proc/cmdline 2>/dev/null >/dev/null; then
+# show_debug_banner
+# /mnt/live/bin/ash || /bin/bash || /bin/sh
+#fi
+
+# if autoexec= boot parameter is present, automatically start the command
given.
+# If you need to execute several commands, separate them using ';'
+# If you need to use spaces in your command, use ~ instead
+# If you wish to reboot/poweroff after the command's execution is finished,
+# simply use autoexec=yourCommand;poweroff for example.
+AUTOCMD=$(cmdline_value "autoexec" | tr "~" " ")
+if [ "$AUTOCMD" != "" ]; then
+ echo "starting autoexec command: su --login -c \"$AUTOCMD\""
+ su --login -c "$AUTOCMD"
+fi
diff --git a/parse_cmdline.in b/parse_cmdline.in
index bbe4749..b0035e9 100644
--- a/parse_cmdline.in
+++ b/parse_cmdline.in
@@ -67,33 +67,3 @@ printf '[1;32m
================================================================
}
gen_issue > /etc/issue
-
-. /usr/lib/liblinuxlive
-
-# change password
-NEWROOTPASS="`cmdline_value passwd`"
-if [ "$NEWROOTPASS" = "ask" ]; then
- echo -ne "\nEnter new password for root: "
- read -s NEWROOTPASS
-fi
-
-if [ ! "$NEWROOTPASS" = "" ]; then
- echo "root:$NEWROOTPASS" | /usr/sbin/chpasswd
-fi
-
-# debug
-#if grep debug /proc/cmdline 2>/dev/null >/dev/null; then
-# show_debug_banner
-# /mnt/live/bin/ash || /bin/bash || /bin/sh
-#fi
-
-# if autoexec= boot parameter is present, automatically start the command
given.
-# If you need to execute several commands, separate them using ';'
-# If you need to use spaces in your command, use ~ instead
-# If you wish to reboot/poweroff after the command's execution is finished,
-# simply use autoexec=yourCommand;poweroff for example.
-AUTOCMD=$(cmdline_value "autoexec" | tr "~" " ")
-if [ "$AUTOCMD" != "" ]; then
- echo "starting autoexec command: su --login -c \"$AUTOCMD\""
- su --login -c "$AUTOCMD"
-fi
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
