Menu
▾
▴
devil-linux-commit — Mailing list for CVS commit messages.
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(202) |
Nov
(201) |
Dec
(280) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(493) |
Feb
(106) |
Mar
(215) |
Apr
(163) |
May
(79) |
Jun
(193) |
Jul
(47) |
Aug
(71) |
Sep
(127) |
Oct
(41) |
Nov
(49) |
Dec
(120) |
| 2005 |
Jan
(147) |
Feb
(45) |
Mar
(26) |
Apr
(71) |
May
(52) |
Jun
(28) |
Jul
(92) |
Aug
(50) |
Sep
(35) |
Oct
(193) |
Nov
(106) |
Dec
(52) |
| 2006 |
Jan
(51) |
Feb
(38) |
Mar
(33) |
Apr
(79) |
May
(107) |
Jun
(67) |
Jul
(21) |
Aug
(65) |
Sep
(44) |
Oct
(87) |
Nov
(12) |
Dec
(56) |
| 2007 |
Jan
(48) |
Feb
(58) |
Mar
(63) |
Apr
(31) |
May
(25) |
Jun
(20) |
Jul
(72) |
Aug
(54) |
Sep
(30) |
Oct
(76) |
Nov
(74) |
Dec
(25) |
| 2008 |
Jan
(39) |
Feb
(39) |
Mar
(62) |
Apr
(64) |
May
(59) |
Jun
(31) |
Jul
(25) |
Aug
(25) |
Sep
(17) |
Oct
(24) |
Nov
|
Dec
(1) |
| 2009 |
Jan
(60) |
Feb
(39) |
Mar
(16) |
Apr
(30) |
May
(52) |
Jun
(35) |
Jul
(15) |
Aug
(15) |
Sep
(21) |
Oct
(32) |
Nov
(39) |
Dec
(52) |
| 2010 |
Jan
(42) |
Feb
(40) |
Mar
(23) |
Apr
(20) |
May
(27) |
Jun
(10) |
Jul
(30) |
Aug
(30) |
Sep
(66) |
Oct
(12) |
Nov
(35) |
Dec
(60) |
| 2011 |
Jan
(16) |
Feb
(1) |
Mar
(3) |
Apr
(28) |
May
(21) |
Jun
|
Jul
(12) |
Aug
(6) |
Sep
(10) |
Oct
(14) |
Nov
(40) |
Dec
(60) |
| 2012 |
Jan
(23) |
Feb
(17) |
Mar
(24) |
Apr
(18) |
May
(13) |
Jun
(1) |
Jul
|
Aug
(5) |
Sep
|
Oct
(5) |
Nov
(5) |
Dec
(15) |
| 2013 |
Jan
(2) |
Feb
(5) |
Mar
(1) |
Apr
(2) |
May
(2) |
Jun
(3) |
Jul
|
Aug
(3) |
Sep
(5) |
Oct
(3) |
Nov
(1) |
Dec
(1) |
| 2014 |
Jan
(3) |
Feb
(5) |
Mar
(8) |
Apr
(3) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
(4) |
Oct
(10) |
Nov
|
Dec
(9) |
| 2015 |
Jan
(18) |
Feb
(17) |
Mar
(5) |
Apr
(2) |
May
|
Jun
(5) |
Jul
(1) |
Aug
(2) |
Sep
(1) |
Oct
(24) |
Nov
(20) |
Dec
(41) |
| 2016 |
Jan
(9) |
Feb
(3) |
Mar
(2) |
Apr
(7) |
May
(8) |
Jun
(1) |
Jul
(6) |
Aug
(5) |
Sep
(2) |
Oct
(6) |
Nov
(1) |
Dec
(6) |
| 2017 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
(4) |
May
(1) |
Jun
(1) |
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Heiko Z. <smi...@us...> - 2012-01-06 00:59:00
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv21942 Modified Files: CHANGES md5sum.lst Log Message: - updated freetype to 2.4.8 - updated grsecurity to 2.2.2-3.1.7-201201032037 - updated krb5 to 1.8.5 - updated nut to 2.6.3 - updated openldap to 2.4.28 - updated openvpn to 2.2.2 - updated kernel to 3.1.7 - updated snort to 2.9.2 - updated xtables-addons to 1.40 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1497 retrieving revision 1.1498 diff -u -d -r1.1497 -r1.1498 --- CHANGES 4 Jan 2012 17:00:12 -0000 1.1497 +++ CHANGES 6 Jan 2012 00:58:58 -0000 1.1498 @@ -22,6 +22,15 @@ # 1.6.0-RC2 +- updated freetype to 2.4.8 +- updated grsecurity to 2.2.2-3.1.7-201201032037 +- updated krb5 to 1.8.5 +- updated nut to 2.6.3 +- updated openldap to 2.4.28 +- updated openvpn to 2.2.2 +- updated kernel to 3.1.7 +- updated snort to 2.9.2 +- updated xtables-addons to 1.40 - don't hardcode the path to gzip in logrotate.conf - webmin is now correctly installed again - avahi init script didnt start program in daemon mode Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.654 retrieving revision 1.655 diff -u -d -r1.654 -r1.655 --- md5sum.lst 1 Jan 2012 18:32:07 -0000 1.654 +++ md5sum.lst 6 Jan 2012 00:58:58 -0000 1.655 @@ -154,7 +154,7 @@ e3f65753cdfe12209a522634b801305d src/frandom-1.0.tar.gz 862d3a2c11011e61890ba84fa636ed8c src/freeradius-server-2.1.12.tar.bz2 ca3f1990522815ccd0a78e9de3afad43 src/freeramdisk.tar.gz -d76233108aca9c9606cdbd341562ad9a src/freetype-2.3.9.tar.bz2 +dbf2caca1d3afd410a29217a9809d397 src/freetype-2.4.8.tar.bz2 d30c35b9820d706ff2f9a6ab3b501247 src/frox-0.7.18.tar.bz2 3dc99583119473ae7a36a8fd660b8e53 src/fwlogwatch-1.2.tar.bz2 52b41c6c4418b3226dfb8f82076193bb src/gawk-3.1.8.tar.bz2 @@ -183,7 +183,7 @@ 03e3451a38b0d615cb113cbeaf252dc0 src/grep-2.9.tar.gz b2151714de0c8d31d864fc7b7b9fcb3a src/groff-1.20.1-badchar.patch.bz2 48fa768dd6fdeb7968041dd5ae8e2b02 src/groff-1.20.1.tar.gz -a8073b1215eed4fc58bc7f90830050e0 src/grsecurity-2.2.2-3.1.6-201112222105.patch.bz2 +1076b195241202b4c0a5110619ad4de1 src/grsecurity-2.2.2-3.1.7-201201032037.patch.bz2 27e360b951f006c464299d06bbd63442 src/grub-1.99.tar.xz 167f952085ab6e1d7695fb12be92fccd src/grub-patches.tar.xz e381b8506210c794278f5527cba0e765 src/gzip-1.4.tar.gz @@ -244,7 +244,7 @@ 31e7156698a6f214b4067afb9e13728f src/kid-0.9.6.tar.gz 11d6ea999f1819e1b5535895ab0cc848 src/knock-0.5.patch.bz2 ca09d61458974cff90a700aba6120891 src/knock-0.5.tar.gz -1597a1e762f6e0d6fec6fd78638d0f4b src/krb5-1.8.3.tar.gz +362c6dbb27d33c2a9083bb7dd507d39a src/krb5-1.8.5.tar.gz c5dba6b80f583070fe9e6ed6e0c2162e src/l2tpd-0.69.tar.gz 571f031068ea7861282f0525d67a9aa0 src/l2tpd-patches.tgz 91be154d12134dcdbc560cc7aa7fe4ce src/l7-protocols-2009-05-28.tar.gz @@ -359,21 +359,20 @@ c011fc1595dd125443df2d357958c85f src/noip_updater_linux_v1.4.tar.gz b2d75e2962f1e3151ef58794d60c9e97 src/nrpe-2.12.tar.gz 33a98e7975f633a9489d7a8938ed6131 src/nsca-2.7.2.tar.gz -eebab40c6ce2f54e5c377b4895c0c93a src/nss_ldap-264.tar.gz c1cb02d1a85538cf16bca6f6a562abe4 src/nss_ldap-265.tar.gz 116df99cf548431393991ea15443c52f src/ntop-4.1.0.tar.gz 553eabf09b568294854700540c46821f src/ntop-patches.tar.bz2 d04bfa9566e3249d7bb5fbd5f563a9b6 src/ntp-4.2.4_p6-nano.patch.bz2 1447121a07b49361677ffda4f6e29527 src/ntp-4.2.6p4.tar.gz -f6d0683e51e0fcab06e6a79724685d26 src/nut-2.6.2.tar.gz +8db00c21f8bc03add6e14d15f634ec6a src/nut-2.6.3.tar.gz cf1c017496b066b45ffe3d7a303fd6ad src/oidentd-2.0.7.tar.gz f39402fb6c14bcf569fcdb683796df71 src/open-iscsi-git-20110526.tar.bz2 428d803f6fe3424af88768fc2f88f9ae src/open-vm-tools-2011.11.20-535097.tar.gz e3d08dedfb9e6a9a1e24f6766f6dadd0 src/openl2tp-1.8.tar.gz -ec63f9c2add59f323a0459128846905b src/openldap-2.4.25.tgz +196023e552eeb259e048edcd61a9645b src/openldap-2.4.28.tgz afe17eee7e98d3b8550cc349834a85d0 src/openssh-5.9p1.tar.gz 7040b89c4c58c7a1016c0dfa6e821c86 src/openssl-1.0.0e.tar.gz -500bee5449b29906150569aaf2eb2730 src/openvpn-2.2.1.tar.gz +c5181e27b7945fa6276d21873329c5c7 src/openvpn-2.2.2.tar.gz 587171c4e15a40adde8aa1b3d77328e9 src/opt-3.19.tar.gz 01d241f9aec36ffd2b189fdf58b076ec src/otpd-3.2.5.tar.gz 029aa2a3a103e7eb81b4aa731b93539e src/p11-kit-0.9.tar.gz @@ -385,7 +384,7 @@ e6f90c8e57e236d45626d479feca2dc4 src/pam_otp_auth-3.2.2.tar.gz a5d27ccbaaad9d9fb254b01a3c12bd06 src/pam_radius-1.3.17.tar.gz 30ceb6df7e8681891e865e2fe5a7903d src/parted-2.3.tar.gz -b59adeac6d593fe993e964ea9e259c42 src/patch-3.1.6.xz +499626638e433ffc77f938d0bc63a041 src/patch-3.1.7.xz 289248c80d96184a902ffac1db56543f src/patch-o-matic-ng-20090819.tar.bz2 ad241429bf352d1b55493153f2eaae2f src/pax-linux-2.6.32.10-test27.patch.bz2 d0a801704862e48d4bf46114019d30ae src/pax-utils-cvs-20111227.tar.xz @@ -696,7 +695,7 @@ 8d59e70d21d8f0568e310d342e3e2306 src/sipcalc-1.1.5.tar.gz 45e5a44803181e2bf3361d562060c904 src/siproxd-0.7.1.tar.gz a282846532ecbd6b4a28072373b3a70b src/smartmontools-5.38.tar.gz -7a245c6e7cdf298cab196f0f69108468 src/snort-2.9.1.1.tar.gz +22fa07ba915535b151329056439ae194 src/snort-2.9.2.tar.gz 5be313a60c27ae522700e20b557ade33 src/special/Mail-SpamAssassin-rules-3.3.0.r901671.tgz 5fd86c3316dc49dba172490fdafea5b3 src/special/README 77668c37a0b13753c65eee5db3a4b009 src/special/tzcode2010l.tar.gz @@ -773,7 +772,7 @@ fbd2c1c5abed4b11047bea6ce53bc6e4 src/xfsprogs-3.1.6.tar.gz 567382d7972613090215c6c54f9b82d9 src/xinetd-2.3.14.tar.gz ab6614c785f5b653fcc69fb9c02058f0 src/xmbmon205.tar.gz -463be03548ca4e8b013740cfa2746d4c src/xtables-addons-1.39.tar.bz2 +2c809e90b08afe5841254c66d7f4be51 src/xtables-addons-1.40.tar.xz cc4044fcc073b8bcf3164d1d0df82161 src/xz-4.999.9beta.tar.bz2 8a852581c831eb6e699a16d741a7ec52 src/yp-tools-2.9.tar.gz 390470ce9f41bd6929102972b9b8a1b7 src/yp_auth.patch.bz2 |
|
From: Heiko Z. <smi...@us...> - 2012-01-05 17:37:56
|
Update of /cvsroot/devil-linux/build/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv9491 Modified Files: nss_ldap Log Message: fix compile issue Index: nss_ldap =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nss_ldap,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- nss_ldap 5 Dec 2011 09:11:38 -0000 1.3 +++ nss_ldap 5 Jan 2012 17:37:54 -0000 1.4 @@ -18,6 +18,7 @@ build ) if [ "$CONFIG_NSSLDAPLIB" = "y" ]; then ./configure --prefix='' || exit 1 + replace_str Makefile " vers_string" " ./vers_string" make $PMAKE all || exit 1 fi |
|
From: Heiko Z. <smi...@us...> - 2012-01-04 17:00:15
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv15486 Modified Files: CHANGES Log Message: don't hardcode the path to gzip in logrotate.conf Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1496 retrieving revision 1.1497 diff -u -d -r1.1496 -r1.1497 --- CHANGES 2 Jan 2012 14:19:26 -0000 1.1496 +++ CHANGES 4 Jan 2012 17:00:12 -0000 1.1497 @@ -22,6 +22,7 @@ # 1.6.0-RC2 +- don't hardcode the path to gzip in logrotate.conf - webmin is now correctly installed again - avahi init script didnt start program in daemon mode - updated dhcp to 4.2.3-P1 |
|
From: Heiko Z. <smi...@us...> - 2012-01-04 13:17:54
|
Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory vz-cvs-3.sog:/tmp/cvs-serv15663
Modified Files:
mount_cdrom
Log Message:
be more verbose on the ramdisk sizes, so we can better analyze problems
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- mount_cdrom 29 Dec 2011 21:32:01 -0000 1.56
+++ mount_cdrom 4 Jan 2012 13:17:52 -0000 1.57
@@ -166,7 +166,7 @@
mkdir -p ${RAMDISK}
/sbin/mount -n -t tmpfs -o size=${RAMDISK_SIZE}m shmfs ${RAMDISK}
- echo -n "Copying system image (${IMAGE_SIZE_MB} MB) to ramdisk..."
+ echo -n "Copying system image (${IMAGE_SIZE_MB} MB) to ramdisk (${RAMDISK_SIZE} MB)..."
busy_start
case ${MEDIATYPE} in
CDROM ) # don't keep it mounted while copying
@@ -234,6 +234,7 @@
RAMDISK_SIZE=$(df -k ${RAMDISK} | grep "${RAMDISK}" | awk '{print $(NF-3)}')
# mount ramdisk read-only and reduce to minimal size
+ echo "Reducing ramdisk size to ${RAMDISK_SIZE}k"
/sbin/mount -n -o remount,ro,size=${RAMDISK_SIZE}k shmfs ${RAMDISK}
# loop mount final ISO image from ramdisk
|
|
From: Heiko Z. <smi...@us...> - 2012-01-02 14:19:29
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv25697 Modified Files: CHANGES Log Message: webmin is now correctly installed again Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1495 retrieving revision 1.1496 diff -u -d -r1.1495 -r1.1496 --- CHANGES 2 Jan 2012 00:03:16 -0000 1.1495 +++ CHANGES 2 Jan 2012 14:19:26 -0000 1.1496 @@ -22,6 +22,7 @@ # 1.6.0-RC2 +- webmin is now correctly installed again - avahi init script didnt start program in daemon mode - updated dhcp to 4.2.3-P1 - added cifs-utils 5.2 |
|
From: Heiko Z. <smi...@us...> - 2012-01-02 00:03:19
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv1769 Modified Files: CHANGES Log Message: avahi init script didnt start program in daemon mode Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1494 retrieving revision 1.1495 diff -u -d -r1.1494 -r1.1495 --- CHANGES 1 Jan 2012 18:32:07 -0000 1.1494 +++ CHANGES 2 Jan 2012 00:03:16 -0000 1.1495 @@ -22,6 +22,7 @@ # 1.6.0-RC2 +- avahi init script didnt start program in daemon mode - updated dhcp to 4.2.3-P1 - added cifs-utils 5.2 - added keyutils 1.5.5 |
|
From: Heiko Z. <smi...@us...> - 2012-01-01 18:32:10
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv7753 Modified Files: CHANGES md5sum.lst Log Message: updated dhcp to 4.2.3-P1 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1493 retrieving revision 1.1494 diff -u -d -r1.1493 -r1.1494 --- CHANGES 31 Dec 2011 14:59:51 -0000 1.1493 +++ CHANGES 1 Jan 2012 18:32:07 -0000 1.1494 @@ -22,6 +22,7 @@ # 1.6.0-RC2 +- updated dhcp to 4.2.3-P1 - added cifs-utils 5.2 - added keyutils 1.5.5 - added libcap-ng 0.6.6 Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.653 retrieving revision 1.654 diff -u -d -r1.653 -r1.654 --- md5sum.lst 31 Dec 2011 17:32:31 -0000 1.653 +++ md5sum.lst 1 Jan 2012 18:32:07 -0000 1.654 @@ -101,7 +101,7 @@ e16faf22dad88638da3daf9cbfa4e022 src/denyhosts_2.6-7.diff.gz f5456bb157447c3d122fe6674014c816 src/dev86-0.16.17-noelks-1.patch.bz2 e03f8e11d3c39e7a159d72ba8875f786 src/dev86-0.16.17-x86_64-1.patch.bz2 -bb0f0434cd796f76aa7cead391d71f31 src/dhcp-4.2.2.tar.gz +04599f1557a5cafd10d7745267a68c8b src/dhcp-4.2.3-P1.tar.gz 832e3cd6bfcaff64e9476e0ff7849e8f src/dhcpcd-5.2.12.tar.bz2 519c0a0cbac28ddb992111ec2c3f82aa src/dialog-1.1-20100428.tar.gz 29c15b2de8bf33685029e035fa680a6e src/diffutils-3.1.tar.gz |
|
From: Heiko Z. <smi...@us...> - 2012-01-01 15:34:28
|
Update of /cvsroot/devil-linux/build/scripts/configuration/profiles In directory vz-cvs-3.sog:/tmp/cvs-serv11738/configuration/profiles Modified Files: default server Log Message: - added cifs-utils 5.2 - added keyutils 1.5.5 - added libcap-ng 0.6.6 Index: default =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/default,v retrieving revision 1.129 retrieving revision 1.130 diff -u -d -r1.129 -r1.130 --- default 10 Dec 2011 20:58:16 -0000 1.129 +++ default 1 Jan 2012 15:34:25 -0000 1.130 @@ -252,3 +252,4 @@ CONFIG_AVAHI=y CONFIG_KNOCK=y CONFIG_FAIL2BAN=y +CONFIG_CIFSUTILS=y Index: server =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/profiles/server,v retrieving revision 1.42 retrieving revision 1.43 diff -u -d -r1.42 -r1.43 --- server 15 Dec 2011 14:32:29 -0000 1.42 +++ server 1 Jan 2012 15:34:25 -0000 1.43 @@ -251,3 +251,4 @@ CONFIG_AVAHI=y CONFIG_KNOCK=y CONFIG_FAIL2BAN=y +CONFIG_CIFSUTILS=y |
|
From: Heiko Z. <smi...@us...> - 2012-01-01 15:34:27
|
Update of /cvsroot/devil-linux/build/scripts/configuration In directory vz-cvs-3.sog:/tmp/cvs-serv11738/configuration Modified Files: samba.config Log Message: - added cifs-utils 5.2 - added keyutils 1.5.5 - added libcap-ng 0.6.6 Index: samba.config =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/configuration/samba.config,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- samba.config 10 Sep 2004 23:16:25 -0000 1.4 +++ samba.config 1 Jan 2012 15:34:25 -0000 1.5 @@ -5,4 +5,5 @@ # # http://www.devil-linux.org -menu_add "Networking|Services" bool "Samba" CONFIG_SAMBA +menu_add "Networking|Services" bool "Samba" CONFIG_SAMBA +test "$CONFIG_SAMBA" = "y" && menu_add "Networking|Services" bool "CIFS Utils" CONFIG_CIFSUTILS |
|
From: Heiko Z. <smi...@us...> - 2011-12-31 17:32:33
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv24517 Modified Files: md5sum.lst Log Message: problems with old file Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.652 retrieving revision 1.653 diff -u -d -r1.652 -r1.653 --- md5sum.lst 31 Dec 2011 14:59:51 -0000 1.652 +++ md5sum.lst 31 Dec 2011 17:32:31 -0000 1.653 @@ -240,7 +240,7 @@ e850eb91e4d3b94b194efe8e953204c5 src/kbd-1.15.2.tar.bz2 6c3065c94bb9e2187c4b5a80f6d8be31 src/keepalived-1.1.20.tar.gz 246cc0b3578a25dc134e22e7829b87e4 src/kernel-patches-3.x.tar.xz -9e8ab5164bc8f84be148761cc89e9d6f src/keyutils-1.5.5.tar.bz2 +8f1d0848952f650735dcb795dbb804bd src/keyutils-1.5.5.tar.xz 31e7156698a6f214b4067afb9e13728f src/kid-0.9.6.tar.gz 11d6ea999f1819e1b5535895ab0cc848 src/knock-0.5.patch.bz2 ca09d61458974cff90a700aba6120891 src/knock-0.5.tar.gz |
|
From: Heiko Z. <smi...@us...> - 2011-12-31 14:59:54
|
Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv25715/scripts
Modified Files:
samba
Log Message:
- added cifs-utils 5.2
- added keyutils 1.5.5
- added libcap-ng 0.6.6
Index: samba
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/samba,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- samba 5 Dec 2011 09:11:38 -0000 1.36
+++ samba 31 Dec 2011 14:59:52 -0000 1.37
@@ -28,6 +28,9 @@
--enable-nss-wrapper --enable-socket-wrapper --with-pam --with-pam_smbpass || exit 1
make proto || exit 1
make $PMAKE || exit 1
+
+ # some tools need samba installed
+ make install || exit 1
fi
;;
|
|
From: Heiko Z. <smi...@us...> - 2011-12-30 18:18:08
|
Update of /cvsroot/devil-linux/build/scripts/config In directory vz-cvs-3.sog:/tmp/cvs-serv9259/scripts/config Modified Files: VERSION Log Message: increased the version number Index: VERSION =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/config/VERSION,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- VERSION 2 Nov 2011 14:03:41 -0000 1.34 +++ VERSION 30 Dec 2011 18:18:06 -0000 1.35 @@ -1 +1 @@ -1.6.0-RC1 +1.6.0-RC2 |
|
From: Heiko Z. <smi...@us...> - 2011-12-29 21:32:04
|
Update of /cvsroot/devil-linux/build/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv27790/scripts
Modified Files:
grsecurity quagga
Log Message:
- updated grsecurity to 2.2.2-3.1.6-201112222105
- updated ipac-ng to 1.34.2
- updated patch to 3.1.6
- updated postgresql to 8.4.10
- updated quagga to 0.99.20
- updated radvd to 1.8.3
- updated samba to 3.5.12
- updated stunnel to 4.50
Index: quagga
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/quagga,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- quagga 5 Dec 2011 09:11:38 -0000 1.16
+++ quagga 29 Dec 2011 21:32:01 -0000 1.17
@@ -19,12 +19,12 @@
case $1 in
build )
if [ "$CONFIG_QUAGGA" = "y" ]; then
- if [ ! -f devil-linux-quagga-patches.done ]; then
- touch devil-linux-quagga-patches.done
- for i in $( ls $DL_DIR/src/quagga-*.patch.bz2); do
- bzcat $i | patch -p1 || exit 1
- done
- fi
+ #if [ ! -f devil-linux-quagga-patches.done ]; then
+ # touch devil-linux-quagga-patches.done
+ # for i in $( ls $DL_DIR/src/quagga-*.patch.bz2); do
+ # bzcat $i | patch -p1 || exit 1
+ # done
+ #fi
if [ "$CONFIG_NET_SNMP" = "y" ]; then
SNMP="--enable-snmp"
fi
Index: grsecurity
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/grsecurity,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- grsecurity 12 Dec 2011 13:49:18 -0000 1.47
+++ grsecurity 29 Dec 2011 21:32:01 -0000 1.48
@@ -40,6 +40,7 @@
set_kernel_option CONFIG_IP_NF_SECURITY m
set_kernel_option CONFIG_IP6_NF_SECURITY m
set_kernel_option CONFIG_SECURITY_TOMOYO n
+ set_kernel_option CONFIG_GRKERNSEC_SETXID n
# start oldconfig, in case there are new options
make oldconfig || exit 1
|
|
From: Heiko Z. <smi...@us...> - 2011-12-29 21:32:03
|
Update of /cvsroot/devil-linux/build/config/etc/initrd
In directory vz-cvs-3.sog:/tmp/cvs-serv27790/config/etc/initrd
Modified Files:
mount_cdrom
Log Message:
- updated grsecurity to 2.2.2-3.1.6-201112222105
- updated ipac-ng to 1.34.2
- updated patch to 3.1.6
- updated postgresql to 8.4.10
- updated quagga to 0.99.20
- updated radvd to 1.8.3
- updated samba to 3.5.12
- updated stunnel to 4.50
Index: mount_cdrom
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/initrd/mount_cdrom,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- mount_cdrom 21 Dec 2011 01:03:33 -0000 1.55
+++ mount_cdrom 29 Dec 2011 21:32:01 -0000 1.56
@@ -172,10 +172,10 @@
CDROM ) # don't keep it mounted while copying
/sbin/umount -n ${mountpoint}
# it's a CDROM drive therefore we use a blocksize of 2k
- dd if=$disk of=${RAMDISK}/${IMAGE} bs=2048 >/dev/null 2>&1 || COPY2RAM='fail'
+ dd if=$disk of=${RAMDISK}/${IMAGE} bs=2048 > /shm/copytoramdiskoutput 2>&1 || COPY2RAM='fail'
;;
FILE ) # it's a file so copy will do
- cp ${FILEMOUNT}/${IMAGE} ${RAMDISK}/${IMAGE} >/dev/null 2>&1 || COPY2RAM='fail'
+ cp ${FILEMOUNT}/${IMAGE} ${RAMDISK}/${IMAGE} > /shm/copytoramdiskoutput 2>&1 || COPY2RAM='fail'
;;
esac
busy_stop
@@ -184,6 +184,7 @@
# in case of an error we need to clean up
run_from_ram_cleanup () {
$YELLOW; echo "Falling back to standard mount..."; $NORMAL
+ rm /shm/copytoramdiskoutput > /dev/null 2>&1
sleep 10
/sbin/umount -n ${mountpoint} > /dev/null 2>&1
/sbin/umount -n ${RAMDISK} > /dev/null 2>&1
@@ -196,16 +197,21 @@
# if [ "$(df ${RAMDISK} | grep "${RAMDISK}" | awk '{print $(NF-2)}')" -eq 0 ]; then
if [ "x$COPY2RAM" = "xfail" ]; then
$RED;
- echo "ERROR: ramdisk size calculation error"
- echo " the image to copy was bigger than expected"
+ echo "ERROR while copying data to the ramdisk"
echo
- echo 'Please report to bu...@de...'
+ echo 'Please report this on our bug tracking system'
+ echo 'http://sourceforge.net/apps/mantisbt/devil-linux'
+ echo
+ echo 'Output from copy command:'
+ cat /shm/copytoramdiskoutput
echo
$NORMAL
run_from_ram_cleanup
return 1
fi
+ rm /shm/copytoramdiskoutput > /dev/null 2>&1
+
# get size of the copied image
local REAL_SIZE=$(du -k ${RAMDISK}/${IMAGE} | awk '{print $1}')
let REAL_SIZE=REAL_SIZE*10/1024+5 # do correct rounding
|
|
From: Heiko Z. <smi...@us...> - 2011-12-29 00:58:28
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv1311 Modified Files: CHANGES Log Message: remove WIP message Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1489 retrieving revision 1.1490 diff -u -d -r1.1489 -r1.1490 --- CHANGES 28 Dec 2011 00:36:30 -0000 1.1489 +++ CHANGES 29 Dec 2011 00:58:26 -0000 1.1490 @@ -22,7 +22,6 @@ # 1.6.0-RC1 -WIP - resolved bug #118 - install-on-usb fails to install grub (64 bit versions) - resolved bug #109: install-on-usb - report chroot as possible cause of failure (Dominic Raferd / HZ) - resolved bug #90 - add local beep for serial console (Dominic Raferd / HZ) - updated bacula to 5.2.3 |
|
From: Heiko Z. <smi...@us...> - 2011-12-29 00:57:17
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv1229/scripts/scripts Modified Files: install-on-usb Log Message: add warning about grub2 support not being implemented yet Index: install-on-usb =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- install-on-usb 28 Dec 2011 00:36:30 -0000 1.38 +++ install-on-usb 29 Dec 2011 00:57:14 -0000 1.39 @@ -136,6 +136,11 @@ if [ -n "$(grub-install -v | grep "1.9")" ]; then GRUBVERSION=2 + echo "!!!!!!WARNING!!!!!!" + echo "Grub2 is not yet supported by this script" + echo "We're looking for volunteers to fix the script and send us a patch ;-)" + echo "!!!!!!WARNING!!!!!!" + echo fi device_map=grub-tmp-map |
|
From: Heiko Z. <smi...@us...> - 2011-12-28 00:36:32
|
Update of /cvsroot/devil-linux/build/scripts/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv21662/scripts/scripts Modified Files: install-on-usb Log Message: resolved bug #109: install-on-usb - report chroot as possible cause of failure (Dominic Raferd / HZ) Index: install-on-usb =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/scripts/install-on-usb,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- install-on-usb 18 Dec 2011 21:27:24 -0000 1.37 +++ install-on-usb 28 Dec 2011 00:36:30 -0000 1.38 @@ -289,6 +289,9 @@ IMAGE="bootcd.squash" elif [ "x$IMAGEFS" = "xiso9660" ]; then IMAGE="bootcd.iso" + elif [ -z "$IMAGEFS" ]; then + echo -e "Can't locate mounted image - maybe you are chrooted?" + return 1 else echo "Unsupported image format: $IMAGEFS" return 1 |
|
From: Heiko Z. <smi...@us...> - 2011-12-28 00:32:30
|
Update of /cvsroot/devil-linux/build/config/etc/init.d
In directory vz-cvs-3.sog:/tmp/cvs-serv20307/config/etc/init.d
Modified Files:
beep
Log Message:
resolved bug #90 - add local beep for serial console (Dominic Raferd / HZ)
Index: beep
===================================================================
RCS file: /cvsroot/devil-linux/build/config/etc/init.d/beep,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- beep 17 Dec 2011 23:52:46 -0000 1.6
+++ beep 28 Dec 2011 00:32:28 -0000 1.7
@@ -47,16 +47,15 @@
case "$1" in
start)
echo "Starting $NAME: "
-# loadproc $DAEMON $PARAMETER
# #DL = -.. .-..
- #if [ "`tty`" = "/dev/console" ]; then
- # # for serial console, force bell sound to local machine
- # for m in {1..3}; do
- # for n in {4..1}; do
- # sleep 0.$n; echo -en "\a">/dev/tty0
- # done
- # done
- #else
+ if grep -iq ttyS /proc/cmdline; then
+ # for serial console, force bell sound to local machine
+ for m in {1..3}; do
+ for n in {4..1}; do
+ sleep 0.$n; echo -en "\a">/dev/tty0
+ done
+ done
+ else
beep -f 880 -l 400
beep -f 3000 -l 200
beep -f 3000 -l 200 -D 600
@@ -64,7 +63,7 @@
beep -f 880 -l 400
beep -f 3000 -l 200
beep -f 3000 -l 200
- #fi
+ fi
;;
stop)
# echo -n "Shutting down $NAME: "
|
|
From: Heiko Z. <smi...@us...> - 2011-12-27 20:58:44
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv23743 Modified Files: CHANGES md5sum.lst Log Message: - updated bacula to 5.2.3 - removed the ebtables init script, since it's not compatible with DL please add the ebtables rules to the firewall.rules script - updated ebtables to 2.0.10-4 Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1486 retrieving revision 1.1487 diff -u -d -r1.1486 -r1.1487 --- CHANGES 27 Dec 2011 17:13:31 -0000 1.1486 +++ CHANGES 27 Dec 2011 20:58:41 -0000 1.1487 @@ -23,6 +23,10 @@ 1.6.0-RC1 WIP - resolved bug #118 - install-on-usb fails to install grub (64 bit versions) +- updated bacula to 5.2.3 +- removed the ebtables init script, since it's not compatible with DL + please add the ebtables rules to the firewall.rules script +- updated ebtables to 2.0.10-4 - updated pax-utils to cvs-20111227 - closed bug #106 - pre_init: logic of /sbin/upgrade-config call - automatic upgrade is now available with "a" (good luck!) Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.649 retrieving revision 1.650 diff -u -d -r1.649 -r1.650 --- md5sum.lst 27 Dec 2011 17:13:32 -0000 1.649 +++ md5sum.lst 27 Dec 2011 20:58:41 -0000 1.650 @@ -38,7 +38,7 @@ c2972c4d9b3e29c03d5f2af86249876f src/automake-1.11.1.tar.bz2 e4db89a2a403ff4c47d66ac66fad1f43 src/avahi-0.6.30.tar.gz 26a5b19fa9f395e9e7dafed37b795d7f src/awstats-6.95.tar.gz -227b88f56ae085da8f48823b220d4c87 src/bacula-5.2.2.tar.gz +43e41c3f88e7ba86d0dd248935ce2f00 src/bacula-5.2.3.tar.gz 3fb927c7c33022f1c327f14a81c0d4b0 src/bash-4.2.tar.gz f474be7d6c12fb197264b3fe32142b66 src/bash-patches.tar.bz2 d541419fd7e5642952d7b48cbb40c712 src/beep-1.2.2.tar.gz @@ -123,7 +123,7 @@ d85a64fdde2987b27ac6fbab5be605a0 src/e1000-8.0.30.tar.gz 05f70470aea2ef7efbb0845b2b116720 src/e2fsprogs-1.41.14.tar.gz 91727db818e5170b2d78a99ee51c2d58 src/eagle-usb-2.3.2.tar.bz2 -0e0c20adf2bba6d91dbd0b74a1a38c33 src/ebtables-v2.0.9-1.tar.gz +506742a3d44b9925955425a659c1a8d0 src/ebtables-v2.0.10-4.tar.gz d0f22544abc3314910e7b5799059a57f src/ether-wake-1.09.tar.bz2 b85741676992894c6520c54912cb96ea src/ethtool-2.6.37.tar.bz2 f9c32814f78ea2629850f0440de5ff34 src/eventlog_0.2.12.tar.gz |
|
From: Heiko Z. <smi...@us...> - 2011-12-27 17:13:34
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv7885 Modified Files: CHANGES Makefile.build md5sum.lst Log Message: updated pax-utils to cvs-20111227 changed a few script dependencies to avoid build failures Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- Makefile.build 23 Dec 2011 16:15:03 -0000 1.41 +++ Makefile.build 27 Dec 2011 17:13:32 -0000 1.42 @@ -36,7 +36,7 @@ libnetfilter_conntrack libxslt mcrypt mysql h323plus \ pam_mount neon tz Pound -GROUP_16 := util-linux gawk groff coreutils +GROUP_16 := util-linux gawk groff coreutils grep gperf file GROUP_17 := e2fsprogs gdchart openldap pam_mysql postgresql \ wvstreams iperf irqbalance @@ -53,9 +53,9 @@ dhcp dhcpcd dialog diffutils djbdns \ dnsmasq dosfstools dovecot dst dvd+rw-tools \ ebtables ether-wake ethtool eventlog ez-ipupdate \ - fetchmail file fprobe \ - fprobe-ulog freeramdisk fwlogwatch gperf \ - grep grsecurity grub \ + fetchmail fprobe \ + fprobe-ulog freeramdisk fwlogwatch \ + grsecurity grub \ hdparm hostap-driver i2c id3 \ ifenslave inetutils inotify-tools insserv sipcalc \ iproute2 iptraf iputils ipvsadm isapnptools \ @@ -389,7 +389,7 @@ fetchmail: | $(GROUP_18) -file: | $(GROUP_18) +file: | $(GROUP_15) findutils: | $(GROUP_08) @@ -403,9 +403,9 @@ gawk: | $(GROUP_15) util-linux -gperf: | $(GROUP_18) +gperf: | $(GROUP_15) -grep: | $(GROUP_18) +grep: | $(GROUP_15) groff: | $(GROUP_15) gawk Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1485 retrieving revision 1.1486 diff -u -d -r1.1485 -r1.1486 --- CHANGES 21 Dec 2011 19:55:44 -0000 1.1485 +++ CHANGES 27 Dec 2011 17:13:31 -0000 1.1486 @@ -23,6 +23,7 @@ 1.6.0-RC1 WIP - resolved bug #118 - install-on-usb fails to install grub (64 bit versions) +- updated pax-utils to cvs-20111227 - closed bug #106 - pre_init: logic of /sbin/upgrade-config call - automatic upgrade is now available with "a" (good luck!) - upgrade has now to be initiated with "u", any other key skips Index: md5sum.lst =================================================================== RCS file: /cvsroot/devil-linux/build/md5sum.lst,v retrieving revision 1.648 retrieving revision 1.649 diff -u -d -r1.648 -r1.649 --- md5sum.lst 17 Dec 2011 23:52:46 -0000 1.648 +++ md5sum.lst 27 Dec 2011 17:13:32 -0000 1.649 @@ -385,7 +385,7 @@ 829f9aa6d1ec6a4d16506d118ab0703a src/patch-3.1.5.xz 289248c80d96184a902ffac1db56543f src/patch-o-matic-ng-20090819.tar.bz2 ad241429bf352d1b55493153f2eaae2f src/pax-linux-2.6.32.10-test27.patch.bz2 -acf0e368cb33bc2f6a335ba3f5e4fd2b src/pax-utils-0.1.15.tar.bz2 +d0a801704862e48d4bf46114019d30ae src/pax-utils-cvs-20111227.tar.xz 6ec138522977dc7654d33ddbe32755f0 src/paxctl-0.5.tar.gz 94b88762af6b5970a6f6ceef2e814221 src/pci.ids.bz2 35222edb86b50a6641352c66fe829b2e src/pciutils-3.1.7.tar.bz2 |
|
From: Heiko Z. <smi...@us...> - 2011-12-23 16:15:06
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv10039 Modified Files: Makefile.build Log Message: postfix needs perl Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- Makefile.build 23 Dec 2011 13:24:22 -0000 1.40 +++ Makefile.build 23 Dec 2011 16:15:03 -0000 1.41 @@ -545,7 +545,7 @@ pohmelfs: | $(GROUP_18) -postfix: | $(GROUP_18) +postfix: | $(GROUP_18) perl pptp-patches: | $(GROUP_18) |
|
From: Heiko Z. <smi...@us...> - 2011-12-23 13:24:24
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv23754 Modified Files: Makefile.build Log Message: perl needs to finish first Index: Makefile.build =================================================================== RCS file: /cvsroot/devil-linux/build/Makefile.build,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- Makefile.build 10 Dec 2011 19:11:54 -0000 1.39 +++ Makefile.build 23 Dec 2011 13:24:22 -0000 1.40 @@ -509,7 +509,7 @@ netacct-mysql: | $(GROUP_18) -netpbm: | $(GROUP_18) +netpbm: | $(GROUP_18) perl nfs-utils: | $(GROUP_18) |
|
From: Heiko Z. <smi...@us...> - 2011-12-22 01:48:06
|
Update of /cvsroot/devil-linux/build/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv9688 Modified Files: build-iso Log Message: make sure we use the higher number for parallelism Index: build-iso =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/build-iso,v retrieving revision 1.90 retrieving revision 1.91 diff -u -d -r1.90 -r1.91 --- build-iso 3 Sep 2011 14:19:40 -0000 1.90 +++ build-iso 22 Dec 2011 01:48:04 -0000 1.91 @@ -19,6 +19,10 @@ source settings source functions +# make sure we use the greater of the 2 +if [ $CONFIG_PARALLEL_JOBS -lt $CONFIG_PMAKE ]; then + CONFIG_PARALLEL_JOBS=$CONFIG_PMAKE +fi case $1 in iso ) |
|
From: Heiko Z. <smi...@us...> - 2011-12-21 19:55:47
|
Update of /cvsroot/devil-linux/build/scripts/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv25806/scripts/scripts
Modified Files:
pre_init upgrade-config
Log Message:
- closed bug #106 - pre_init: logic of /sbin/upgrade-config call
- automatic upgrade is now available with "a" (good luck!)
- upgrade has now to be initiated with "u", any other key skips
- we now only wait 2 minutes for a upgrade-config decision, default behavior
- is to skip
Index: pre_init
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/pre_init,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- pre_init 19 May 2011 18:34:31 -0000 1.33
+++ pre_init 21 Dec 2011 19:55:44 -0000 1.34
@@ -101,23 +101,42 @@
$NORMAL
echo
cp -f /etc-cd/{Devil-release,issue,issue.net} /shm/etc-mods/
- bs="n"
- read -n 1 -t 300 -p 'Press any key to upgrade, or "n" to skip. (timeout in 5 minutes)' bs
- echo
- if [ "$bs" != "n" ]; then
- echo
- echo -n "Comparing configurations, please wait "
- /sbin/upgrade-config
- echo
- $YELLOW
- echo
- echo 'You MUST run "save-config" after bootup to save your new config'
- echo
- $NORMAL
- echo
- read -n 1 -t 300 -p 'Press any key to continue ... (timeout in 5 minutes)'
+ while true
+ do
+ bs="n"
+ read -n 1 -t 120 -p 'Press "u" to upgrade, "a" for automatic upgrade, or "n" to skip. (timeout in 2 minutes)' bs
+ test $? -gt 0 && bs="n"
echo
- fi
+ case "$bs" in
+ "u" )
+ echo
+ echo -n "Comparing configurations, please wait "
+ /sbin/upgrade-config
+ echo
+ $YELLOW
+ echo
+ echo 'You MUST run "save-config" after bootup to save your new config'
+ echo
+ $NORMAL
+ echo
+ read -n 1 -t 300 -p 'Press any key to continue ... (timeout in 5 minutes)'
+ echo
+ break
+ ;;
+ "a" )
+ echo
+ echo -n "Comparing configurations, please wait "
+ /sbin/upgrade-config auto
+ break
+ ;;
+ "n" )
+ echo "skipping"
+ break
+ ;;
+ * )
+ echo
+ esac
+ done
unset bs
fi
Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- upgrade-config 18 Dec 2011 19:36:18 -0000 1.46
+++ upgrade-config 21 Dec 2011 19:55:44 -0000 1.47
@@ -9,6 +9,11 @@
#
# Written by: Bruce Smith <dev...@re...>
+AUTOCONFIG=0
+if [ "$1" = "auto" ]; then
+ AUTOCONFIG=1
+fi
+
DL_CONFIG_DIR="/floppy"
DL_CONFIG_SOURCE="$(cat /shm/DL_CONFIG_SOURCE)"
DL_CONFIG_FILE="$(cat /shm/DL_CONFIG_FILE)"
@@ -17,6 +22,7 @@
TMPD=/shm/var/tmp/upd-etc.$$
TMPF=/shm/var/tmp/upd-tmp.$$
CMPF=/shm/var/tmp/upd-cmpf.$$
+AUTOF=/shm/var/tmp/upd-autof.$$
RESULT=/shm/var/tmp/upd-res.$$
RAMDISKDIR="/shm"
LOGF="/shm/upgrade.log"
@@ -104,6 +110,9 @@
fi
echo > $CMPF
+rm -f $AUTOF 2> /dev/null
+touch $AUTOF
+
touch -t 198101010101.01 /shm/oldfile
for f in $(find $FINDDIR -type f -mtime $MTIME -print)
do
@@ -134,19 +143,30 @@
[ -f "$f" -a "$f" -ot /shm/oldfile ] && onoff="off"
cmp -s "/etc/$f" "$CMPDIR/$f" || echo "$f" \"\" $onoff \"$f\" >> $TMPD
echo "$f" >> $CMPF
+ if [ "$onoff" = "on" ]; then
+ echo "\"$f\"" >> $AUTOF
+ fi
done
+echo
rm -f /shm/oldfile
-msgbox "Please read:" "The next screen will let you select which of your old config files you want to copy to your new configuration \n\nBe VERY CAREFUL to only copy files you have customized. Copying other files could cause severe problems.\n\nNote: Selecting \"Help\" will display info about the current file, but upon return you will lose all selections made."
+if [ ${AUTOCONFIG} -eq 0 ]; then
+ msgbox "Please read:" "The next screen will let you select which of your old config files you want to copy to your new configuration \n\nBe VERY CAREFUL to only copy files you have customized. Copying other files could cause severe problems.\n\nNote: Selecting \"Help\" will display info about the current file, but upon return you will lose all selections made."
+fi
while true
do
- setmenuheight
- eval $DIALOG --title \"Select files to be copied to the new config\" --backtitle \"$BACKTITLE\" \
- --item-help --help-button \
- --checklist \"[un]select files to be kept with the SPACE BAR\" 0 $width $height \
- $(sort $TMPD) 2> $RESULT
- RETURN=$?
+ if [ ${AUTOCONFIG} -eq 0 ]; then
+ setmenuheight
+ eval $DIALOG --title \"Select files to be copied to the new config\" --backtitle \"$BACKTITLE\" \
+ --item-help --help-button \
+ --checklist \"[un]select files to be kept with the SPACE BAR\" 0 $width $height \
+ $(sort $TMPD) 2> $RESULT
+ RETURN=$?
+ else
+ RESULT=$AUTOF
+ RETURN=0
+ fi
if [ $RETURN -eq 0 ]; then
if [ "$(head -n1 $RESULT|cut -c1-4)" = "HELP" ]; then
@@ -229,23 +249,9 @@
done
fi
-# echo >> $LOGF
-# echo "Symlinks preserved from old config:" >> $LOGF
-# echo "-----------------------------------" >> $LOGF
-# echo >> $LOGF
-# for f in $(find /etc/ -type l | grep -v "init.d/rc" | grep -v "init.d/boot.d")
-# do
-# eval p=$f
-# d="$(dirname $p)"
-# if [ ! -d $CMPDIR/$d ]; then
-# mkdir -p $CMPDIR/$d
-# chmod --reference /$d $CMPDIR/$d
-# chown --reference /$d $CMPDIR/$d
-# fi
-# echo "preserving link: $f" | tee -a $LOGF
-# cp -dpf $f $CMPDIR/$f
-# done
- pause
+ if [ ${AUTOCONFIG} -eq 0 ]; then
+ pause
+ fi
break
fi
else
@@ -255,8 +261,17 @@
done
echo
-if askyesno "/etc/sysconfig/config migration" "Do you want to migrate old values to your new /etc/sysconfig/config ?" yes
-then
+
+DOIT=0
+if [ ${AUTOCONFIG} -eq 0 ]; then
+ if askyesno "/etc/sysconfig/config migration" "Do you want to migrate old values to your new /etc/sysconfig/config ?" yes ; then
+ DOIT=1
+ fi
+else
+ DOIT=1
+fi
+
+if [ ${DOIT} -eq 1 ]; then
echo >> $LOGF
echo >> $LOGF
echo "/etc/sysconfig/config migration:" >> $LOGF
@@ -275,10 +290,21 @@
do
eval mod_config /etc/sysconfig/config ${bs} \"\$${bs}\"
done
- pause
+ if [ ${AUTOCONFIG} -eq 0 ]; then
+ pause
+ fi
fi
-if askyesno "User and Group migration" "Do you want to migrate your old users, groups and passwords?" yes ; then
+DOIT=0
+if [ ${AUTOCONFIG} -eq 0 ]; then
+ if askyesno "User and Group migration" "Do you want to migrate your old users, groups and passwords?" yes ; then
+ DOIT=1
+ fi
+else
+ DOIT=1
+fi
+
+if [ ${DOIT} -eq 1 ]; then
migrateid ()
{
if [ -n "${PREUFS}" ]; then
|
|
From: Heiko Z. <smi...@us...> - 2011-12-21 19:55:46
|
Update of /cvsroot/devil-linux/build In directory vz-cvs-3.sog:/tmp/cvs-serv25806 Modified Files: CHANGES Log Message: - closed bug #106 - pre_init: logic of /sbin/upgrade-config call - automatic upgrade is now available with "a" (good luck!) - upgrade has now to be initiated with "u", any other key skips - we now only wait 2 minutes for a upgrade-config decision, default behavior - is to skip Index: CHANGES =================================================================== RCS file: /cvsroot/devil-linux/build/CHANGES,v retrieving revision 1.1484 retrieving revision 1.1485 diff -u -d -r1.1484 -r1.1485 --- CHANGES 21 Dec 2011 01:03:32 -0000 1.1484 +++ CHANGES 21 Dec 2011 19:55:44 -0000 1.1485 @@ -23,6 +23,10 @@ 1.6.0-RC1 WIP - resolved bug #118 - install-on-usb fails to install grub (64 bit versions) +- closed bug #106 - pre_init: logic of /sbin/upgrade-config call +- automatic upgrade is now available with "a" (good luck!) +- upgrade has now to be initiated with "u", any other key skips +- we now only wait 2 minutes for a upgrade-config decision, default behavior is to skip - resolved bug #105 - mount_cdrom: incomplete version match of the boot and the found cd image - time(zone) is not set before the file systems are mounted - upgrade-config did not execute insserv to correct the init script order |
2 messages has been excluded from this view by a project administrator.
