[Demudi-commits] r543 - in packages/demudi/trunk: cfengine2 cfengine2/chunks cfengine2/scripts debian debian-cd/data/sarge
Free Ekanayaka
free-guest@costa.debian.org
Tue, 12 Apr 2005 19:08:20 +0000
Author: free-guest
Date: 2005-04-12 19:08:18 +0000 (Tue, 12 Apr 2005)
New Revision: 543
Added:
packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_preferences
packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_sources.list
packages/demudi/trunk/cfengine2/scripts/apt
packages/demudi/trunk/cfengine2/scripts/sysv-rc
Removed:
packages/demudi/trunk/cfengine2/scripts/procps
Modified:
packages/demudi/trunk/cfengine2/cfagent.conf.in
packages/demudi/trunk/cfengine2/scripts/module-init-tools
packages/demudi/trunk/debian-cd/data/sarge/demudi_i386_preseed
packages/demudi/trunk/debian/changelog
Log:
* [debian-cd]
* [debian]
* [tasksel]
* [cfengine2]
Modified: packages/demudi/trunk/cfengine2/cfagent.conf.in
===================================================================
--- packages/demudi/trunk/cfengine2/cfagent.conf.in 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/cfagent.conf.in 2005-04-12 19:08:18 UTC (rev 543)
@@ -36,6 +36,14 @@
###############################################################################
import:
+ prebaseconfig::
+ bash
+ postbaseconfig::
+ gdm
+ module-init-tools
+ xserver-xorg
+ apt
+ sysv-rc
#IMPORT#
###############################################################################
Added: packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_preferences
===================================================================
--- packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_preferences 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_preferences 2005-04-12 19:08:18 UTC (rev 543)
@@ -0,0 +1,2 @@
+Pin: release o=AGNULA, l=DeMuDi
+Pin-Priority: 1001
Added: packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_sources.list
===================================================================
--- packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_sources.list 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/chunks/apt-etc_apt_sources.list 2005-04-12 19:08:18 UTC (rev 543)
@@ -0,0 +1,2 @@
+# A/DeMuDi
+#deb http://apt.agnula.org/demudi stable main
Added: packages/demudi/trunk/cfengine2/scripts/apt
===================================================================
--- packages/demudi/trunk/cfengine2/scripts/apt 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/scripts/apt 2005-04-12 19:08:18 UTC (rev 543)
@@ -0,0 +1,43 @@
+files:
+ /etc/apt/sources.list
+ mode=644
+ owner=root
+ group=root
+ action=touch
+
+ /etc/apt/preferences
+ mode=644
+ owner=root
+ group=root
+ action=touch
+
+editfiles:
+
+ { /etc/apt/preferences
+ BeginGroupIfNoLineContaining "AGNULA"
+ InsertFile "$(chunks)/apt-etc_apt_preferences"
+ EndGroup
+ }
+
+ { /etc/apt/sources.list
+ BeginGroupIfNoLineContaining "$(begin)"
+ Append "$(begin)"
+ Append "$(end)"
+ GotoLastLine
+ IncrementPointer "-1"
+ EndGroup
+
+ LocateLineMatching "$(begin)"
+ InsertLine "$(comment)"
+ InsertLine ""
+ InsertFile "$(chunks)/apt-etc_apt_sources.list"
+ InsertLine ""
+ IncrementPointer "1"
+ DeleteToLineMatching "$(end)"
+ }
+
+ networked::
+ { /etc/apt/sources.list
+ SetCommentStart "#"
+ UnCommentLinesContaining "$(agnula)"
+ }
Modified: packages/demudi/trunk/cfengine2/scripts/module-init-tools
===================================================================
--- packages/demudi/trunk/cfengine2/scripts/module-init-tools 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/scripts/module-init-tools 2005-04-12 19:08:18 UTC (rev 543)
@@ -3,3 +3,5 @@
{ /etc/modules
AppendIfNoSuchLine "snd-seq-midi"
}
+shellcommands:
+ "/usr/sbin/invoke-rc.d module-init-tools start"
Deleted: packages/demudi/trunk/cfengine2/scripts/procps
===================================================================
--- packages/demudi/trunk/cfengine2/scripts/procps 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/scripts/procps 2005-04-12 19:08:18 UTC (rev 543)
@@ -1,5 +0,0 @@
-editfiles:
-
- { /etc/sysctl.conf
- AppendIfNoSuchLine "kernel.lowlatency = 1"
- }
Added: packages/demudi/trunk/cfengine2/scripts/sysv-rc
===================================================================
--- packages/demudi/trunk/cfengine2/scripts/sysv-rc 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/cfengine2/scripts/sysv-rc 2005-04-12 19:08:18 UTC (rev 543)
@@ -0,0 +1,2 @@
+shellcommands:
+ "/usr/sbin/update-rc.d -f cron remove; /usr/sbin/update-rc.d -f anacron remove"
Modified: packages/demudi/trunk/debian/changelog
===================================================================
--- packages/demudi/trunk/debian/changelog 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/debian/changelog 2005-04-12 19:08:18 UTC (rev 543)
@@ -1,12 +1,18 @@
demudi (0.8) UNRELEASED; urgency=low
- * Merged code from demudi-tasksel and demudi-debtags
- * Fixed missing link for grub splash image
- * Added sox to the dsp task
- * Added replaces and conflicts for upgrades from earlier versions
- * Added mhwaveedit to the edit task
- * Added rtirq to the base task
- * [cfengine] append snd-seq-midi to /etc/modules
+ * [debian-cd]
+ - late_command: fixed missing link for grub splash image
+ * [debian]
+ - added replaces and conflicts for upgrades from earlier versions
+ * [tasksel]
+ - edit: added mhwaveedit
+ - base: added rtirq
+ - dsp: added xsox
+ * [cfengine2]
+ - module-init-tools: append snd-seq-midi to /etc/modules
+ - apt: add demudi data to sources.list and preferences
+ - sysv-rc: disable cron and anacron
+ - procps: remove, no longer needed with kernel 2.6
-- Free Ekanayaka <free@agnula.org> Tue, 12 Apr 2005 19:18:41 +0200
Modified: packages/demudi/trunk/debian-cd/data/sarge/demudi_i386_preseed
===================================================================
--- packages/demudi/trunk/debian-cd/data/sarge/demudi_i386_preseed 2005-04-12 17:19:07 UTC (rev 542)
+++ packages/demudi/trunk/debian-cd/data/sarge/demudi_i386_preseed 2005-04-12 19:08:18 UTC (rev 543)
@@ -8,7 +8,8 @@
d-i grub-installer/skip boolean false
-base-config base-config/late_command string echo apt-get update | batch; update-rc.d -f cron remove; update-rc.d -f anacron remove; demudi-cfengine bash; demudi-cfengine procps; /etc/init.d/procps.sh restart
+base-config base-config/early_command string demudi-cfengine pre-base-config
+base-config base-config/late_command string demudi-cfengine post-base-config
base-config tzconfig/gmt boolean false
base-config tzconfig/choose_country_zone_single boolean true