From c33cf0dfcbe8ecf156592eb527491f6f44d1befc Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Wed, 5 Aug 2009 04:19:29 +0200 Subject: [PATCH] 90-update-alternatives: use wm-ng as default x-window-manager --- debian/changelog | 4 +++- etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d808ef..dd7227d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,8 +11,10 @@ grml-live (0.9.21) UNRELEASED; urgency=low * grml_cleanup_chroot: get rid of /etc/lvm/cache/.cache and /etc/lvm/backup/main as well. * grml_cleanup_chroot: drop the /usr/include/linux checks. + * 90-update-alternatives: use wm-ng as default x-window-manager. + [Closes: issue716] - -- Michael Prokop Wed, 05 Aug 2009 03:51:58 +0200 + -- Michael Prokop Wed, 05 Aug 2009 04:19:14 +0200 grml-live (0.9.20) unstable; urgency=low diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index d8487b3..234e56a 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -21,9 +21,9 @@ set -u # $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny # $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny $ROOTCMD ln -sf /etc/alternatives/editor /usr/bin/editor - $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/editor + $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/editor $ROOTCMD ln -sf /etc/alternatives/vi /usr/bin/vi - $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vi + $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vi fi fi @@ -50,5 +50,9 @@ if [ -r $target/usr/bin/w3m ] ; then $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m fi +if [ -r $target/usr/bin/wm-ng ] ; then + $ROOTCMD update-alternatives --set x-window-manager /usr/bin/wm-ng +fi + ## END OF FILE ################################################################# # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3 -- 2.1.4