projects / fai-configs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 596a7c4)
removed network-manager from FAIBASE
authorstephen mahood <mv@fsf.org>
Tue, 23 Dec 2014 20:41:29 +0000 (15:41 -0500)
committerstephen mahood <mv@fsf.org>
Tue, 23 Dec 2014 20:41:29 +0000 (15:41 -0500)
package_config/FAIBASE patch | blob | blame | history
scripts/IKIWIKI/20-setup-ikiwiki patch | blob | blame | history

diff --git a/package_config/FAIBASE b/package_config/FAIBASE
index ac1aece838d584830e3a9832a39b64ed379c33e8..835054a3e6efc9cdfb85e7188188e9208f4d5711 100644 (file)
--- a/package_config/FAIBASE
+++ b/package_config/FAIBASE
@@ -29,3 +29,4 @@ manpages
 man-db
 rsyslogd-
 syslog-ng
+network-manager-
\ No newline at end of file
diff --git a/scripts/IKIWIKI/20-setup-ikiwiki b/scripts/IKIWIKI/20-setup-ikiwiki
index 76c77d973858e624143660c5e9dc29bf5bf8425b..44659933aa52a5358bd9c01ed63237ec9c2c158d 100644 (file)
--- a/scripts/IKIWIKI/20-setup-ikiwiki
+++ b/scripts/IKIWIKI/20-setup-ikiwiki
@@ -6,5 +6,5 @@ if [ ! -e /etc/ikiwiki/ikiwiki.setup ]; then
  fcopy -v /etc/ikiwiki/ikiwiki.setup
 
  # run setup
- $ROOTCMD ikiwiki --setup /etc/ikiwiki/ikiwiki.setup/DEFAULT
+ $ROOTCMD ikiwiki --setup /etc/ikiwiki/auto.setup/DEFAULT
 fi