[PATCHES] udpkg and cdebconf buglets
I'm working on getting a demo3a that will (hopefully) bring the network up.
While doing that I found what I think are tiny bugs in udpkg and cdebconf.
With these patches applied my little chroot is getting a lot happier.
The cdebconf one is pretty trivial, a relative path name was still sneaking in.
Index: debian/rules
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/cdebconf/debian/rules,v
retrieving revision 1.6
diff -u -r1.6 rules
--- debian/rules 2000/12/10 01:26:46 1.6
+++ debian/rules 2000/12/29 04:57:53
@@ -17,8 +17,8 @@
ARCH=$(shell dpkg --print-architecture)
FILENAME=$(PACKAGE)_$(VERSION)_$(ARCH).udeb
PRIORITY=$(shell grep ^Priority: debian/control | cut -d ' ' -f 2)
-CONFFILE=etc/debconf.conf
-#CONFFILE=/etc/debconf.conf
+#CONFFILE=etc/debconf.conf
+CONFFILE=/etc/debconf.conf
clean:
dh_testdir
This one was causing udpkg to not install debconf config files. We want them
right, so we can have the main menu do dpkg-reconfigure?
Index: udpkg.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/udpkg/udpkg.c,v
retrieving revision 1.24
diff -u -r1.24 udpkg.c
--- udpkg.c 2000/12/21 22:28:26 1.24
+++ udpkg.c 2000/12/29 05:40:23
@@ -99,7 +99,7 @@
int i;
char *adminscripts[] = { "prerm", "postrm", "preinst", "postinst",
"conffiles", "md5sums", "shlibs",
- "templates" };
+ "templates", "config" };
DPRINTF("Unpacking %s\n", pkg->package);
And this one was messing up the package status database so debconf thought
things were half-installed when they were really installed.
Index: status.c
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/udpkg/status.c,v
retrieving revision 1.18
diff -u -r1.18 status.c
--- status.c 2000/12/08 05:59:10 1.18
+++ status.c 2000/12/29 05:40:21
@@ -26,7 +26,7 @@
"deinstall", "purge", 0 },
{ (char *)STATUS_FLAGSTART, "ok", "reinstreq", "hold",
"hold-reinstreq", 0 },
- { (char *)STATUS_STATUSSTART, "not-installed", "unpacked",
+ { (char *)STATUS_STATUSSTART, "not-installed", "unpacked", "half-configured",
"installed", "half-installed",
"config-files", "post-inst-failed",
"removal-failed", 0 }
Index: udpkg.h
===================================================================
RCS file: /cvs/debian-boot/debian-installer/tools/udpkg/udpkg.h,v
retrieving revision 1.11
diff -u -r1.11 udpkg.h
--- udpkg.h 2000/12/21 22:28:26 1.11
+++ udpkg.h 2000/12/29 05:40:23
@@ -46,8 +46,9 @@
#define STATUS_STATUSINSTALLED (1 << 12)
#define STATUS_STATUSHALFINSTALLED (1 << 13)
#define STATUS_STATUSCONFIGFILES (1 << 14)
+#define STATUS_STATUSPOSTINSTFAILED (1 << 15)
#define STATUS_STATUSREMOVALFAILED (1 << 16)
-#define STATUS_STATUSMASK ~(STATUS_STATUSNOTINSTALLED | STATUS_STATUSUNPACKED | STATUS_STATUSHALFCONFIGURED | STATUS_STATUSCONFIGFILES | STATUS_STATUSREMOVALFAILED | STATUS_STATUSHALFINSTALLED)
+#define STATUS_STATUSMASK ~(STATUS_STATUSNOTINSTALLED | STATUS_STATUSUNPACKED | STATUS_STATUSHALFCONFIGURED | STATUS_STATUSCONFIGFILES | STATUS_STATUSPOSTINSTFAILED | STATUS_STATUSREMOVALFAILED | STATUS_STATUSHALFINSTALLED)
#define COLOR_WHITE 0
#define COLOR_GRAY 1
Reply to: