projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'upstream/master'
[live-boot-grml.git]
/
components
/
9990-main.sh
diff --git
a/components/9990-main.sh
b/components/9990-main.sh
index
b50952f
..
b0e2a7b
100755
(executable)
--- a/
components/9990-main.sh
+++ b/
components/9990-main.sh
@@
-205,10
+205,15
@@
Live ()
mount --rbind /run/live "${rootmnt}/lib/live/mount"
Fstab
- Netbase
Swap
+ if grep -q debian_networking /proc/cmdline ; then
+ Netbase
+ else
+ Grml_Networking
+ fi
+
exec 1>&6 6>&-
exec 2>&7 7>&-
kill ${tailpid}