Re: Running cdebconf. Status and RFC
Regis Boudin wrote: * debconf/frontend: debconf and cdebconf have different names for the frontends (Readline, Dialog, Gnome, versus text, newt, gtk), which causes all sorts of issues for the transition. Any objection to using cdebconf/frontend instead ? Not really, but the rest of d-i would need to be checked for uses of it. * When switching from debconf to cdebconf, there is the problem of the database. One uses /var/cache/debconf, the other /var/lib/cdebconf by default, meaning either it has to be migrated, or cdebconf will have to use /var/cache/debconf. The main issue of migrating the database is in the case of a system wide upgrade where cdebconf would actually replace debconf. Between the package being unpacked and the postinst script being run, the database will be unconfigured ; so any other package trying to use debconf in this interval won't have access to the previously set values. This includes triggers, e.g. in the man-db postinst. Do you have any opinion in the long term ? In the short term, I could include the migration script for people willing to test, but I would like someone else's view on it before I do it. I can see no way around debconf and cdebconf using the same database, perhaps a preinst would need to move it and set up a symlink so debconf still sees it? -- see shy jo signature.asc Description: Digital signature
FWD: os-prober: bsd detection and new linux detection
- Forwarded message from Andrew Gavrilin andrew.gavri...@rosalab.ru -
Date: Thu, 6 Oct 2011 17:28:36 +0400 (MSD)
From: Andrew Gavrilin andrew.gavri...@rosalab.ru
To: j...@kitenet.net, jo...@debian.org
Subject: os-prober: bsd detection and new linux detection
X-Mailer: Zimbra 6.0.10_GA_2692 (ZimbraWebClient - FF3.0
(Linux)/6.0.10_GA_2692)
Hello.
Hello. I work at ROSA Lab. It's a partner of Mandriva. We will use os-prober
for our installer. These are my improvements.
- End forwarded message -
--
see shy jo
#!/bin/sh
# Sub-tests that require a mounted partition.
set -e
partition=$1
. /usr/share/os-prober/common.sh
types=$(fs_type $partition) || types=NOT-DETECTED
if [ $types = NOT-DETECTED ]; then
debug $1 type not recognised; skipping
exit 0
elif [ $types = swap ]; then
debug $1 is a swap partition; skipping
exit 0
elif [ $types = crypto_LUKS ]; then
debug $1 is a LUKS partition; skipping
exit 0
elif [ $types = ntfs ]; then
if type ntfs-3g /dev/null 21; then
types='ntfs-3g ntfs'
fi
elif [ -z $types ]; then
if type cryptsetup /dev/null 21 \
cryptsetup luksDump $partition /dev/null 21; then
debug $1 is a LUKS partition; skipping
exit 0
fi
for type in $(grep -v nodev /proc/filesystems); do
# hfsplus filesystems are mountable as hfs. Try hfs last so
# that we can tell the difference.
if [ $type = hfs ]; then
delaytypes=${delaytypes:+$delaytypes }$type
elif [ $type = fuseblk ]; then
if type ntfs-3g /dev/null 21; then
types=${types:+$types }ntfs-3g
fi
else
types=${types:+$types }$type
fi
done
fi
tmpmnt=/var/lib/os-prober/mount
if [ ! -d $tmpmnt ]; then
mkdir $tmpmnt
fi
mounted=
if which grub-mount /dev/null 21 \
grub-mount $partition $tmpmnt 2/dev/null; then
debug mounted using GRUB
mounted=1
type=fuseblk
else
ro_partition $partition
for type in $types $delaytypes; do
if [ $type = ufs ]; then
for ufstype in ufs2 44bsd; do
if mount -o ro,ufstype=$ufstype -t $type
$partition $tmpmnt 2/dev/null; then
mounted=1
break
fi
done
else
if mount -o ro -t $type $partition $tmpmnt
2/dev/null; then
mounted=1
fi
fi
if [ $mounted ]; then
debug mounted as $type filesystem
break
fi
done
fi
if [ $mounted ]; then
for test in /usr/lib/os-probes/mounted/*; do
debug running subtest $test
if [ -f $test ] [ -x $test ]; then
if $test $partition $tmpmnt $type; then
debug os found by subtest $test
if ! umount $tmpmnt; then
warn failed to umount $tmpmnt
fi
rmdir $tmpmnt || true
exit 0
fi
fi
done
if ! umount $tmpmnt; then
warn failed to umount $tmpmnt
fi
fi
rmdir $tmpmnt || true
# No tests found anything.
exit 1
#!/bin/sh
# Test for *BSD distributions.
set -e
. /usr/share/os-prober/common.sh
partition=$1
dir=$2
type=$3
if [ $type = ufs ]; then
disk=$(echo $partition | gawk '{ match($0,
/([[:alpha:][:punct:]]+)[[:digit:]]+/, disk); print disk[1] }')
if [ ! -z $disk ]; then
tpartition=$(echo $partition | sed 's|\/|\\/|g')
system=$(fdisk -l $disk | awk
'/'$tpartition'[[:blank:]]+\*[[:blank:]]+.+[[:blank:]]+.+BSD/ {print $7}')
if [ ! -z $system ]; then
title=
if [ -f $dir/etc/motd ]; then
case $system in
FreeBSD | NetBSD | OpenBSD) title=$(cat $dir/etc/motd | gawk '{
match($0,
/('$system')[[:blank:]]+([[:graph:]]+)[[:blank:]]+(\([[:print:]]+\))/, title);
print title[1], title[2], title[3]; exit 0}')
;;
esac
fi
if [ -z $title ]; then
title=$system
fi
label=$(count_next_label $system)
echo $partition:$title:$label:chain
exit 0
else
exit 1
fi
else
exit 1
fi
else
exit 1
fi
#!/bin/sh
# Test for linux distributions.
set -e
. /usr/share/os-prober/common.sh
partition=$1
dir=$2
type=$3
# This test is inaccurate, but given separate / and /boot partitions and the
# fact that only some
Re: Running cdebconf. Status and RFC
Hi Joey, On Thu, October 6, 2011 16:07, Joey Hess wrote: Regis Boudin wrote: * debconf/frontend: debconf and cdebconf have different names for the frontends (Readline, Dialog, Gnome, versus text, newt, gtk), which causes all sorts of issues for the transition. Any objection to using cdebconf/frontend instead ? Not really, but the rest of d-i would need to be checked for uses of it. That part should be fine, I can keep the existing checks for both the old and new fields. * When switching from debconf to cdebconf, there is the problem of the database. One uses /var/cache/debconf, the other /var/lib/cdebconf by default, meaning either it has to be migrated, or cdebconf will have to use /var/cache/debconf. The main issue of migrating the database is in the case of a system wide upgrade where cdebconf would actually replace debconf. Between the package being unpacked and the postinst script being run, the database will be unconfigured ; so any other package trying to use debconf in this interval won't have access to the previously set values. This includes triggers, e.g. in the man-db postinst. Do you have any opinion in the long term ? In the short term, I could include the migration script for people willing to test, but I would like someone else's view on it before I do it. I can see no way around debconf and cdebconf using the same database, perhaps a preinst would need to move it and set up a symlink so debconf still sees it? That could actually be a solution. I'll try something along these lines, and make a new release with only the (c)debconf/frontend change in the meantime. Thanks for the answer and suggstion. Regis -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/23f28abb62289fdb1a9126511a0bd57c.squir...@imalip.net
Bug#644211: installation-reports: d-i daily 2011-10-03 kfreebsd-amd64 missing bzcat
Dennis Boone wrote: Trivial issue: partitioner allows invalid characters in file system labels, then mkfs phase throws a red screen error. Easily enough figured out and fixed from the log console, just silly of it. (I initially set the label for the sole -- root -- partition to /.) You don't say what filesystem you used. zfs? ufs? Linux file systems don't have any restrictions on label contents and probably the partman code for whatever filesystem you used was copied from them. Serious issue: install base system phase fails because bzcat is not available. I _think_ the package in process at the time of failure is bootstrap-base, based on looking at ps after the red screen appears. I would need to see a log file to say for sure, but the package at fault is presumably libgssglue1, which already has an RC bug filed for using bzip compression. -- see shy jo signature.asc Description: Digital signature
Re: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Thu, 6 Oct 2011 07:20:50 +0200, Robert Millan wrote: 2011/10/6 Adam D. Barratt a...@adam-barratt.org.uk: test -e ./tmp/cdrom/tree/boot/zfs || rmdir ./tmp/cdrom/tree/boot/ rmdir: failed to remove `./tmp/cdrom/tree/boot/': Directory not empty [...] $ debdiff kernel-image-8.1-1-486-di_0.6_kfreebsd-i386.udeb kernel-image-8.1-1-486-di_0.6+b1_kfreebsd-i386.udeb [...] Files in second .deb but not in first - -rw-r--r-- root/root /boot/acpi.ko This appears to be due to the fact that the new kfreebsd-8 +squeeze1 kernel on -i386 builds acpi.ko as a module, which is then picked up by existing install this module if it exists rules in kernel-wedge. Actually, the problem is not presence of acpi.ko itself, but the fact that a symlink to this file exists in /boot/. This is due to an old postinst kludge from pre-GRUB time. Okay. A quick fix would be appreciated, whether from the kfreebsd or d-i side, given the increasingly short period of time we have remaining until the point release is scheduled. Attached patch should fix the problem. I can upload a fixed kfreebsd-8 this evening (feel free to NMU if someone has time to verify earlier than that). Forgive my ignorance on the precise mechanics, but is it correct that the /boot/kernel/kernel.gz symlink creation was also removed? Would you be able to also upload a kfreebsd-i386 build? That would help reduce the turnaround time before we can schedule a rebuild of kfreebsd-kernel-di-i386. Regards, Adam -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/ac1933eacf629d91a4529827b879e...@adsl.funky-badger.org
Bug#644211: installation-reports: d-i daily 2011-10-03 kfreebsd-amd64 missing bzcat
You don't say what filesystem you used. zfs? ufs? UFS. Linux file systems don't have any restrictions on label contents and probably the partman code for whatever filesystem you used was copied from them. Yup, that was my guess. I would need to see a log file to say for sure, but the package at fault is presumably libgssglue1, which already has an RC bug filed for using bzip compression. What's the pathname of the logfile that would be useful? De -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20111006162617.ece26ac4...@yagi.h-net.msu.edu
Processing of partman-partitioning_83_amd64.changes
partman-partitioning_83_amd64.changes uploaded successfully to localhost along with the files: partman-partitioning_83.dsc partman-partitioning_83.tar.gz partman-partitioning_83_amd64.udeb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbr3x-0007vs...@franck.debian.org
partman-partitioning_83_amd64.changes ACCEPTED into unstable
Accepted: partman-partitioning_83.dsc to main/p/partman-partitioning/partman-partitioning_83.dsc partman-partitioning_83.tar.gz to main/p/partman-partitioning/partman-partitioning_83.tar.gz partman-partitioning_83_amd64.udeb to main/p/partman-partitioning/partman-partitioning_83_amd64.udeb Override entries for your package: partman-partitioning_83.dsc - source debian-installer partman-partitioning_83_amd64.udeb - optional debian-installer Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbr6o-00085l...@franck.debian.org
Processing of partman-auto_100_amd64.changes
partman-auto_100_amd64.changes uploaded successfully to localhost along with the files: partman-auto_100.dsc partman-auto_100.tar.gz partman-auto_100_amd64.udeb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbrde-0008v4...@franck.debian.org
partman-auto_100_amd64.changes ACCEPTED into unstable
Accepted: partman-auto_100.dsc to main/p/partman-auto/partman-auto_100.dsc partman-auto_100.tar.gz to main/p/partman-auto/partman-auto_100.tar.gz partman-auto_100_amd64.udeb to main/p/partman-auto/partman-auto_100_amd64.udeb Override entries for your package: partman-auto_100.dsc - source debian-installer partman-auto_100_amd64.udeb - standard debian-installer Announcing to debian-devel-chan...@lists.debian.org Closing bugs: 637970 Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbrkr-0001fr...@franck.debian.org
Processing of rootskel_1.98_amd64.changes
rootskel_1.98_amd64.changes uploaded successfully to localhost along with the files: rootskel_1.98.dsc rootskel_1.98.tar.gz rootskel_1.98_amd64.udeb rootskel-bootfloppy_1.98_amd64.udeb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbrnl-0001lk...@franck.debian.org
Bug#637970: marked as done (Enable LVM in mipsel/loongson-2f recipes)
Your message dated Thu, 06 Oct 2011 17:02:18 +
with message-id e1rbrks-0001fa...@franck.debian.org
and subject line Bug#637970: fixed in partman-auto 100
has caused the Debian Bug report #637970,
regarding Enable LVM in mipsel/loongson-2f recipes
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)
--
637970: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637970
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
---BeginMessage---
Package: partman-auto
Version: 99
Hi,
I'd like to be able to use the guided partitioning's encrypted LVM
option on my Yeeloong. I'm able to do so by hacking the
mipsel/loongson-2f's atomic recipe, so the attached patch would allow
others to do so as well.
--
Matt Kraai
https://ftbfs.org/kraai
From 68380d2b52a6b41d3e39e7b43ce5dcec52fe2528 Mon Sep 17 00:00:00 2001
From: Matt Kraai kr...@ftbfs.org
Date: Mon, 15 Aug 2011 21:29:19 -0700
Subject: [PATCH] Enable LVM in mipsel/loongson-2f recipes
---
debian/changelog |6 +-
recipes-mipsel-loongson-2f/atomic |2 ++
recipes-mipsel-loongson-2f/home |3 +++
recipes-mipsel-loongson-2f/multi |6 ++
4 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 20fed03..dd99a8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
partman-auto (100) UNRELEASED; urgency=low
+ [ Colin Watson ]
* Merge from Ubuntu:
- Determine memory size for RAM-dependent recipe elements more
accurately on i386 (LP: #604765).
- -- Colin Watson cjwat...@debian.org Sun, 24 Jul 2011 15:54:13 +0100
+ [ Matt Kraai]
+ * Enable LVM in mipsel/loongson-2f recipes.
+
+ -- Matt Kraai kr...@debian.org Mon, 15 Aug 2011 21:28:26 -0700
partman-auto (99) unstable; urgency=low
diff --git a/recipes-mipsel-loongson-2f/atomic b/recipes-mipsel-loongson-2f/atomic
index 7a02032..bfee5be 100644
--- a/recipes-mipsel-loongson-2f/atomic
+++ b/recipes-mipsel-loongson-2f/atomic
@@ -10,6 +10,7 @@ partman-auto/text/atomic_scheme ::
mountpoint{ /boot } .
500 1 -1 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -17,5 +18,6 @@ partman-auto/text/atomic_scheme ::
mountpoint{ / } .
96 512 300% linux-swap
+ $lvmok{ }
method{ swap }
format{ } .
diff --git a/recipes-mipsel-loongson-2f/home b/recipes-mipsel-loongson-2f/home
index 72f4459..b28eb96 100644
--- a/recipes-mipsel-loongson-2f/home
+++ b/recipes-mipsel-loongson-2f/home
@@ -10,6 +10,7 @@ partman-auto/text/home_scheme ::
mountpoint{ /boot } .
500 4000 7000 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -17,10 +18,12 @@ partman-auto/text/home_scheme ::
mountpoint{ / } .
96 512 300% linux-swap
+ $lvmok{ }
method{ swap }
format{ } .
100 1 -1 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
diff --git a/recipes-mipsel-loongson-2f/multi b/recipes-mipsel-loongson-2f/multi
index bce370c..a5016e1 100644
--- a/recipes-mipsel-loongson-2f/multi
+++ b/recipes-mipsel-loongson-2f/multi
@@ -10,6 +10,7 @@ partman-auto/text/multi_scheme ::
mountpoint{ /boot } .
70 800 280 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -17,6 +18,7 @@ partman-auto/text/multi_scheme ::
mountpoint{ / } .
500 3000 5000 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -24,6 +26,7 @@ partman-auto/text/multi_scheme ::
mountpoint{ /usr } .
70 1500 3000 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -31,10 +34,12 @@ partman-auto/text/multi_scheme ::
mountpoint{ /var } .
96 512 300% linux-swap
+ $lvmok{ }
method{ swap }
format{ } .
20 300 400 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
@@ -42,6 +47,7 @@ partman-auto/text/multi_scheme ::
mountpoint{ /tmp } .
300 3000 -1 $default_filesystem
+ $lvmok{ }
method{ format }
format{ }
use_filesystem{ }
--
1.7.5.4
---End Message---
---BeginMessage---
Source: partman-auto
Source-Version: 100
We believe that the bug you reported is fixed in the latest version of
partman-auto, which is due to be installed in the Debian FTP archive:
partman-auto_100.dsc
to main/p/partman-auto/partman-auto_100.dsc
partman-auto_100.tar.gz
to main/p/partman-auto/partman-auto_100.tar.gz
partman-auto_100_amd64.udeb
to main/p/partman-auto/partman-auto_100_amd64.udeb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now
rootskel_1.98_amd64.changes ACCEPTED into unstable
Accepted: rootskel-bootfloppy_1.98_amd64.udeb to main/r/rootskel/rootskel-bootfloppy_1.98_amd64.udeb rootskel_1.98.dsc to main/r/rootskel/rootskel_1.98.dsc rootskel_1.98.tar.gz to main/r/rootskel/rootskel_1.98.tar.gz rootskel_1.98_amd64.udeb to main/r/rootskel/rootskel_1.98_amd64.udeb Override entries for your package: rootskel-bootfloppy_1.98_amd64.udeb - extra debian-installer rootskel_1.98.dsc - source debian-installer rootskel_1.98_amd64.udeb - standard debian-installer Announcing to debian-devel-chan...@lists.debian.org Thank you for your contribution to Debian. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbra5-0002l8...@franck.debian.org
Bug#610525: lvremove hangs late_command
Just for the records - this problem appears when you call lvremove within the /target chroot environment by in-target. If you remove in-target from your late_command and by this invoke lvremove within d-i's rootfs, it works. Andreas -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/4e8de526.9050...@netshadow.at
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
On Thu, Oct 6, 2011 at 07:20:50 +0200, Robert Millan wrote: Attached patch should fix the problem. I can upload a fixed kfreebsd-8 this evening (feel free to NMU if someone has time to verify earlier than that). What's the status of that upload? Cheers, Julien -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20111006202051.gq2...@radis.liafa.jussieu.fr
Re: os-prober: bsd detection and new linux detection
On Thu, Oct 6, 2011 at 12:16, Joey Hess jo...@debian.org wrote: Hello. I work at ROSA Lab. It's a partner of Mandriva. We will use os-prober for our installer. These are my improvements. I talked to him and he is working at producing a new patch that doesn't depends on bash and going to send it again. Andrew, can you post it here? -- Otavio Salvador O.S. Systems E-mail: ota...@ossystems.com.br http://www.ossystems.com.br Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAP9ODKomp+zjen-cbMwg-b3F+1UGrLhAb0OO+W=rw9jza4k...@mail.gmail.com
Processing of kernel-wedge_2.74+squeeze3.1_kfreebsd-i386.changes
kernel-wedge_2.74+squeeze3.1_kfreebsd-i386.changes uploaded successfully to localhost along with the files: kernel-wedge_2.74+squeeze3.1.dsc kernel-wedge_2.74+squeeze3.1.tar.gz kernel-wedge_2.74+squeeze3.1_all.deb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbvdg-0005l0...@franck.debian.org
Re: Bug#633561: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Julien Cristau jcris...@debian.org:
On Thu, Oct 6, 2011 at 07:20:50 +0200, Robert Millan wrote:
Attached patch should fix the problem. I can upload a fixed
kfreebsd-8 this evening (feel free to NMU if someone has time to
verify earlier than that).
What's the status of that upload?
I realized the symlink in kfreebsd-8 had nothing to do with this. The
actual problem was in kernel-wedge and kfreebsd-kernel-di-i386.
I've just NMUed both packages.
Debdiffs attached.
--
Robert Millan
diff -Nru kernel-wedge-2.74+squeeze3/commands/install-files kernel-wedge-2.74+squeeze3.1/commands/install-files
--- kernel-wedge-2.74+squeeze3/commands/install-files 2011-04-05 04:45:45.0 +0200
+++ kernel-wedge-2.74+squeeze3.1/commands/install-files 2011-10-06 23:01:33.0 +0200
@@ -67,11 +67,6 @@
doit(install, -D, -m, 644,
$sourcedir/boot/kfreebsd-$installedname.gz,
debian/kernel-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz);
- if (-e $sourcedir/lib/modules/$kernelversion-$flavour/acpi.ko) {
- doit(install, -D, -m, 644,
-$sourcedir/lib/modules/$kernelversion-$flavour/acpi.ko,
-debian/kernel-image-$kernelversion-$flavour-di/boot/acpi$extraname.ko);
- }
}
else {
die could not find kernel image;
diff -Nru kernel-wedge-2.74+squeeze3/debian/changelog kernel-wedge-2.74+squeeze3.1/debian/changelog
--- kernel-wedge-2.74+squeeze3/debian/changelog 2011-06-22 03:09:24.0 +0200
+++ kernel-wedge-2.74+squeeze3.1/debian/changelog 2011-10-06 23:04:09.0 +0200
@@ -1,3 +1,10 @@
+kernel-wedge (2.74+squeeze3.1) stable-proposed-updates; urgency=low
+
+ * NMU.
+ * Stop considering acpi.ko as part of the kernel for kFreeBSD.
+
+ -- Robert Millan r...@debian.org Thu, 06 Oct 2011 21:02:18 +
+
kernel-wedge (2.74+squeeze3) stable-proposed-updates; urgency=low
* scsi-extra-modules: hpsa
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/changelog kfreebsd-kernel-di-i386-0.6.1/debian/changelog
--- kfreebsd-kernel-di-i386-0.6/debian/changelog 2011-01-10 15:45:57.0 +0100
+++ kfreebsd-kernel-di-i386-0.6.1/debian/changelog 2011-10-06 23:05:54.0 +0200
@@ -1,3 +1,10 @@
+kfreebsd-kernel-di-i386 (0.6.1) stable; urgency=low
+
+ * NMU.
+ * Rebuild with latest kernel-wedge. Bump build-dependency.
+
+ -- Robert Millan r...@debian.org Thu, 06 Oct 2011 21:05:05 +
+
kfreebsd-kernel-di-i386 (0.6) unstable; urgency=low
* Build against version 8.1+dfsg-7.1.
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/control kfreebsd-kernel-di-i386-0.6.1/debian/control
--- kfreebsd-kernel-di-i386-0.6/debian/control 2011-01-10 16:03:41.0 +0100
+++ kfreebsd-kernel-di-i386-0.6.1/debian/control 2011-10-06 23:06:34.0 +0200
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Uploaders: Otavio Salvador ota...@debian.org, Aurelien Jarno aure...@debian.org
-Build-Depends: kernel-wedge (= 2.66), kfreebsd-image-8.1-1-486 [kfreebsd-i386]
+Build-Depends: kernel-wedge (= 2.74+squeeze3.1), kfreebsd-image-8.1-1-486 [kfreebsd-i386]
Package: kernel-image-8.1-1-486-di
XC-Package-Type: udeb
diff -Nru kfreebsd-kernel-di-i386-0.6/debian/control.stub kfreebsd-kernel-di-i386-0.6.1/debian/control.stub
--- kfreebsd-kernel-di-i386-0.6/debian/control.stub 2010-08-23 02:02:59.0 +0200
+++ kfreebsd-kernel-di-i386-0.6.1/debian/control.stub 2011-10-06 23:04:53.0 +0200
@@ -3,4 +3,4 @@
Priority: optional
Maintainer: Debian Install System Team debian-boot@lists.debian.org
Uploaders: Otavio Salvador ota...@debian.org, Aurelien Jarno aure...@debian.org
-Build-Depends: kernel-wedge (= 2.66)
+Build-Depends: kernel-wedge (= 2.74+squeeze3.1)
Re: kfreebsd-i386 d-i/squeeze FTBFS (was Re: Bug#633561: pu: package kfreebsd-8/8.1+dfsg-8+squeeze1)
2011/10/6 Adam D. Barratt a...@adam-barratt.org.uk: Forgive my ignorance on the precise mechanics, but is it correct that the /boot/kernel/kernel.gz symlink creation was also removed? Yes, this is all curft for backward compatibility with versions of Debian GNU/kFreeBSD that have never been part of a Debian release. However, it's not the cause for this problem (see my other mail). In fact it's probably harmless, and it's gone with 8.2 anyway. I wouldn't worry about them. -- Robert Millan -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAOfDtXNcHrf=_6GseYRVE=+wxeqa0e8rhwedvtfvnhu4d3h...@mail.gmail.com
Processing of kfreebsd-kernel-di-i386_0.6.1_kfreebsd-i386.changes
kfreebsd-kernel-di-i386_0.6.1_kfreebsd-i386.changes uploaded successfully to localhost along with the files: kfreebsd-kernel-di-i386_0.6.1.dsc kfreebsd-kernel-di-i386_0.6.1.tar.gz kernel-image-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nic-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nic-wireless-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nic-shared-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb serial-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb ppp-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb cdrom-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb scsi-core-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb scsi-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb scsi-extra-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb plip-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb floppy-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb loop-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb ipv6-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nls-core-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb ext2-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb isofs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb ntfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb reiserfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb xfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb fat-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb zfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb nullfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb md-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb parport-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb sata-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb acpi-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb i2c-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb crypto-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb crypto-dm-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb mmc-core-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb mmc-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb sound-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb zlib-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb Greetings, Your Debian queue daemon (running on host franck.debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbvi7-0005th...@franck.debian.org
kfreebsd-kernel-di-i386 override disparity
There are disparities between your recently accepted upload and the override file for the following file(s): nullfs-modules-8.1-1-486-di_0.6.1_kfreebsd-i386.udeb: package says priority is standard, override says extra. Please note that a list of new sections were recently added to the archive: cli-mono, database, debug, fonts, gnu-r, gnustep, haskell, httpd, java, kernel, lisp, localization, ocaml, php, ruby, vcs, video, xfce, zope. At this time a script was used to reclassify packages into these sections. If this is the case, please only reply to this email if the new section is inappropriate, otherwise please update your package at the next upload. Either the package or the override file is incorrect. If you think the override is correct and the package wrong please fix the package so that this disparity is fixed in the next upload. If you feel the override is incorrect then please file a bug against ftp.debian.org and explain why. Please INCLUDE the list of packages as seen above, or we won't be able to deal with your request due to missing information. Please make sure that the subject of the bug you file follows the following format: Subject: override: BINARY1:section/priority, [...], BINARYX:section/priority Include the justification for the change in the body of the mail please. [NB: this is an automatically generated mail; if you already filed a bug and have not received a response yet, please ignore this mail. Your bug needs to be processed by a human and will be in due course, but until then the installer will send these automated mails; sorry.] -- Debian distribution maintenance software (This message was generated automatically; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@debian.org) -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1rbvjt-0005bl...@franck.debian.org
Re: os-prober: bsd detection and new linux detection
Andrew, can you post it here?
Yes. New version.
- Исходное сообщение -
От: Otavio Salvador ota...@ossystems.com.br
Кому: debian-boot@lists.debian.org
Копия: Andrew Gavrilin andrew.gavri...@rosalab.ru
Отправленные: Пятница, 7 Октябрь 2011 г 0:21:19
Тема: Re: os-prober: bsd detection and new linux detection
On Thu, Oct 6, 2011 at 12:16, Joey Hess jo...@debian.org wrote:
Hello. I work at ROSA Lab. It's a partner of Mandriva. We will use os-prober
for our installer. These are my improvements.
I talked to him and he is working at producing a new patch that
doesn't depends on bash and going to send it again.
Andrew, can you post it here?
--
Otavio Salvador O.S. Systems
E-mail: ota...@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
diff --git a/os-probes/common/50mounted-tests b/os-probes/common/50mounted-tests
index 7865b51..e61cb13 100755
--- a/os-probes/common/50mounted-tests
+++ b/os-probes/common/50mounted-tests
@@ -54,9 +54,21 @@ if which grub-mount /dev/null 21 \
else
ro_partition $partition
for type in $types $delaytypes; do
- if mount -o ro -t $type $partition $tmpmnt 2/dev/null; then
+ if [ $type = ufs ]; then
+ for ufstype in ufs2 44bsd; do
+if mount -o ro,ufstype=$ufstype -t $type $partition $tmpmnt 2/dev/null; then
+ mounted=1
+ break
+fi
+ done
+ else
+ if mount -o ro -t $type $partition $tmpmnt 2/dev/null; then
+mounted=1
+ fi
+ fi
+
+ if [ $mounted ]; then
debug mounted as $type filesystem
- mounted=1
break
fi
done
diff --git a/os-probes/mounted/common/90bsd-distro b/os-probes/mounted/common/90bsd-distro
new file mode 100755
index 000..b190aab
--- /dev/null
+++ b/os-probes/mounted/common/90bsd-distro
@@ -0,0 +1,45 @@
+#!/bin/sh
+# Test for *BSD distributions.
+set -e
+
+. /usr/share/os-prober/common.sh
+
+partition=$1
+dir=$2
+type=$3
+
+if [ $type = ufs ]; then
+ disk=$(echo $partition | gawk '{ match($0, /([[:alpha:][:punct:]]+)[[:digit:]]+/, disk); print disk[1] }')
+
+ if [ ! -z $disk ]; then
+tpartition=$(echo $partition | sed 's|\/|\\/|g')
+
+system=$(fdisk -l $disk | awk '/'$tpartition'[[:blank:]]+\*[[:blank:]]+.+[[:blank:]]+.+BSD/ {print $7}')
+
+if [ ! -z $system ]; then
+ title=
+
+ if [ -f $dir/etc/motd ]; then
+case $system in
+FreeBSD | NetBSD | OpenBSD) title=$(cat $dir/etc/motd | gawk '{ match($0, /('$system')[[:blank:]]+([[:graph:]]+)[[:blank:]]+(\([[:print:]]+\))/, title); print title[1], title[2], title[3]; exit 0}')
+;;
+esac
+ fi
+
+ if [ -z $title ]; then
+title=$system
+ fi
+
+ label=$(count_next_label $system)
+ echo $partition:$title:$label:chain
+
+ exit 0
+else
+ exit 1
+fi
+ else
+exit 1
+ fi
+else
+ exit 1
+fi
diff --git a/os-probes/mounted/common/90linux-distro b/os-probes/mounted/common/90linux-distro
index f237a38..147c6a1 100755
--- a/os-probes/mounted/common/90linux-distro
+++ b/os-probes/mounted/common/90linux-distro
@@ -13,122 +13,166 @@ type=$3
# better. Make sure this test has a high number so that more accurate tests
# can come first.
# TODO: look for ld-linux.so on arches that have it
-if ls $dir/lib*/ld*.so* /dev/null 2/dev/null; then
- if [ -e $dir/etc/debian_version ]; then
- short=Debian
- long=$(printf Debian GNU/Linux (%s)\n $(cat $dir/etc/debian_version))
- # RPM derived distributions may also have a redhat-release or
- # mandrake-release, so check their files first.
- elif [ -e $dir/etc/altlinux-release ]; then
- short=ALTLinux
- long=$(cat $dir/etc/altlinux-release)
- elif [ -e $dir/etc/magic-release ]; then
- short=Magic
- long=$(cat $dir/etc/magic-release)
- elif [ -e $dir/etc/blackPanther-release ]; then
- short=blackPanther
- long=$(cat $dir/etc/blackPanther-release)
- elif [ -e $dir/etc/ark-release ]; then
- short=Ark
- long=$(cat $dir/etc/ark-release)
- elif [ -e $dir/etc/arch-release ]; then
- short=Arch
- long=$(cat $dir/etc/arch-release)
- elif [ -e $dir/etc/asplinux-release ]; then
- short=ASPLinux
- long=$(cat $dir/etc/asplinux-release)
- elif [ -e $dir/etc/lvr-release ]; then
- short=LvR
- long=$(cat $dir/etc/lvr-release)
- elif [ -e $dir/etc/caos-release ]; then
- short=cAos
- long=$(cat $dir/etc/caos-release)
- elif [ -e $dir/etc/aurox-release ]; then
- short=Aurox
- long=$(cat $dir/etc/aurox-release)
- elif [ -e $dir/etc/engarde-release ]; then
- short=EnGarde
- long=$(cat $dir/etc/engarde-release)
- elif [ -e $dir/etc/vine-release ]; then
- short=Vine
- long=$(cat $dir/etc/vine-release)
- elif [ -e $dir/etc/whitebox-release ]; then
- short=WhiteBox
- long=$(cat $dir/etc/whitebox-release)
- elif [ -e $dir/etc/pld-release ]; then
- short=PLD
- long=$(cat $dir/etc/pld-release)
- elif [ -e $dir/etc/startcom-release ]; then
- short=StartCom
- long=$(cat $dir/etc/startcom-release)
- elif [ -e
