projects
/
grml-autoconfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.15.9
[grml-autoconfig.git]
/
autoconfig.functions
diff --git
a/autoconfig.functions
b/autoconfig.functions
index
dc3e045
..
8ae71d1
100755
(executable)
--- a/
autoconfig.functions
+++ b/
autoconfig.functions
@@
-1317,6
+1317,10
@@
if checkbootparam 'startx' && ! echo "$CMDLINE" | grep -q 'startx.*nostartx' ; t
einfo "Setting up and invoking grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles."
config_userlocal
if $SYSTEMD ; then
einfo "Setting up and invoking grml-x ${WINDOWMANAGER}. Just exit X windows system to get full featured consoles."
config_userlocal
if $SYSTEMD ; then
+ if [ -n "$WINDOWMANAGER" ] ; then
+ mkdir -p /var/run/grml-x/
+ echo "$WINDOWMANAGER" > /var/run/grml-x/window-manager
+ fi
chvt 7
return
fi
chvt 7
return
fi
@@
-1589,7
+1593,7
@@
config_swraid(){
if ! checkbootparam 'swraid' ; then
eindent
if $SYSTEMD ; then
if ! checkbootparam 'swraid' ; then
eindent
if $SYSTEMD ; then
- einfo "Just run '
Start mdmonitor
' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
+ einfo "Just run '
mdadm --assemble --scan
' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
else
einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
fi
else
einfo "Just run 'Start mdadm-raid' to assemble md arrays or boot using 'swraid' as bootoption for autostart."
fi
@@
-1599,7
+1603,7
@@
config_swraid(){
eindent
IFSOLD=${IFS:-}
IFS=$'\n'
eindent
IFSOLD=${IFS:-}
IFS=$'\n'
- for line in $(mdadm --assemble --scan
--auto=yes --symlink=no
2>&1) ; do
+ for line in $(mdadm --assemble --scan 2>&1) ; do
case $line in
*'No arrays found'*)
ewarn "$line" ; eend 0
case $line in
*'No arrays found'*)
ewarn "$line" ; eend 0
@@
-1717,15
+1721,17
@@
config_lvm(){
einfo "You seem to have logical volumes (LVM) on your system."
eindent
if $SYSTEMD ; then
einfo "You seem to have logical volumes (LVM) on your system."
eindent
if $SYSTEMD ; then
- einfo "Just run 'Start lvm2-
lvmetad' to activate them
or boot using 'lvm' as bootoption for autostart."
+ einfo "Just run 'Start lvm2-
pvscan@name' to activate LV or VG 'name'
or boot using 'lvm' as bootoption for autostart."
else
einfo "Just run 'Start lvm2' to activate them or boot using 'lvm' as bootoption for autostart."
fi
eend 0
if checkbootparam 'lvm' ; then
else
einfo "Just run 'Start lvm2' to activate them or boot using 'lvm' as bootoption for autostart."
fi
eend 0
if checkbootparam 'lvm' ; then
- einfo "Bootoption LVM found. Searching for logical volumes:"
+ einfo "Bootoption LVM found. Searching for logical volumes
and enabling them
:"
if $SYSTEMD ; then
if $SYSTEMD ; then
- service_wrapper lvm2-lvmetad start ; eend $?
+ service_wrapper lvm2-lvmetad start
+ vgchange -ay
+ eend $?
else
service_wrapper lvm2 start ; eend $?
fi
else
service_wrapper lvm2 start ; eend $?
fi