diff options
author | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-08-28 21:23:23 (GMT) |
---|---|---|
committer | Cecil Hugh Watson <knoppmyth@gmail.com> | 2010-08-28 21:23:23 (GMT) |
commit | f83117d46d8fc1f6192783371a68607a192c3276 (patch) | |
tree | 21bf30aeb943fe6cb23eb9c62a0ba899de2af0d7 /build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch | |
parent | 69a0137390be9816d5ec5dc9e81d48817a817758 (diff) | |
download | linhes_dev-f83117d46d8fc1f6192783371a68607a192c3276.zip |
Larch 7
Diffstat (limited to 'build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch')
4 files changed, 68 insertions, 0 deletions
diff --git a/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/actions.rc b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/actions.rc new file mode 100644 index 0000000..dd95b26 --- /dev/null +++ b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/actions.rc @@ -0,0 +1,3 @@ +type=0 +orientation=1 + diff --git a/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/autologin b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/autologin new file mode 100644 index 0000000..93ca142 --- /dev/null +++ b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/autologin @@ -0,0 +1 @@ +root
\ No newline at end of file diff --git a/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/bash_profile b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/bash_profile new file mode 100644 index 0000000..c49349b --- /dev/null +++ b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/bash_profile @@ -0,0 +1 @@ +. $HOME/.bashrc diff --git a/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/larch0 b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/larch0 new file mode 100644 index 0000000..c80b7c2 --- /dev/null +++ b/build_tools/l7/larch0/profiles/i686-testing-local/cd-root/larch/copy/larch0 @@ -0,0 +1,63 @@ +# This is a script 'sourced' from the installation script larch-tidy. +# Its purpose is to remove custom live-only stuff from a just-installed +# system. +# ${INSTALL} is the path to the installed system root directory. + +rm "${INSTALL}/root/Desktop/Install Arch Linux.desktop" + +if [ -f ${INSTALL}/etc/rc.local.orig ]; then + mv ${INSTALL}/etc/rc.local.orig ${INSTALL}/etc/rc.local +fi +if [ -f ${INSTALL}/etc/rc.local.shutdown.orig ]; then + mv ${INSTALL}/etc/rc.local.shutdown.orig ${INSTALL}/etc/rc.local.shutdown +fi + +# slim is currently started in inittab +#sed -i '/^DAEMONS=/ s|!slim|@slim|' ${INSTALL}/etc/rc.conf + +# Copy xorg.conf.i810 to target xorg.conf if necessary +if ! [ -f /etc/X11/xorg.conf ]; then + if grep i810 /proc/cmdline &>/dev/null; then + cp /etc/X11/xorg.conf.i810 ${INSTALL}/etc/X11/xorg.conf + fi +fi + +#***************************************************# +# Replace uses of larchquit in xfce panels and menu.# +#***************************************************# +### Unfortunately this isn't very simple. If anyone has a better way of +### providing different Quit actions in the live version and the version +### installed to disk from it, please let me know! +### Maybe it would be better just to provide a special live quit desktop +### icon which can be removed on installation, like the installation icon. + +defaultquit='<builtin name="Quit" cmd="Quit" icon="gnome-logout"/>' + +replacequit () +{ + for f in ${INSTALL}$1/.config/xfce4/panel/*; do + if grep "^Exec=larchquit" ${f}; then + n=$( echo ${f} | sed "s|^.*-\([0-9]\+\).*|\1|" ) + cp /.livesys/actions.rc \ + ${INSTALL}$1/.config/xfce4/panel/actions-${n}.rc + rm ${f} + + sed -i "s|=\"launcher\" id=\"${n}\"|=\"actions\" id=\"${n}\"|" \ + ${INSTALL}$1/.config/xfce4/panel/panels.xml + fi + done + + if [ -f ${INSTALL}$1/.bash_profile ]; then + sed -i "s|<app .*cmd=\"larchquit.*/>|${defaultquit}|" \ + ${INSTALL}$1/.config/xfce4/desktop/menu.xml + + cp /.livesys/xfce4-session.rc ${INSTALL}$1/.config/xfce4-session + cp /.livesys/bash_profile ${INSTALL}$1/.bash_profile + fi +} + +for hd in $( cat ${INSTALL}/etc/passwd | cut -d':' -f6 | grep '^/home/' ) \ + /root /etc/skel; do + replacequit ${hd} &>/dev/null +done +#***************************************************# |