josch/multistrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve device-table incrementing

Browse source 
git-svn-id: http://emdebian.org/svn/current@7978 563faec7-e20c-0410-992a-a66f704d0ccd
This commit is contained in:
codehelp 2011-04-07 14:23:43 +00:00
parent 46b72b659b
commit edcd38f73a
2 changed files with 38 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
multistrap (2.1.14) unstable; urgency=low
* Improve device-table incrementing
-- Neil Williams <codehelp@debian.org> Thu, 07 Apr 2011 15:23:15 +0100
multistrap (2.1.13) unstable; urgency=low multistrap (2.1.13) unstable; urgency=low
* [INTL:da] Danish translation of multistrap (Closes: #614306) * [INTL:da] Danish translation of multistrap (Closes: #614306)

48
device-table.pl
View file

@ -22,7 +22,8 @@ use File::Basename;
use POSIX qw(locale_h); use POSIX qw(locale_h);
use Locale::gettext; use Locale::gettext;
use vars qw/ @list @seq $file $dir $line @cmd $i $dry use vars qw/ @list @seq $file $dir $line @cmd $i $dry
$msg $progname $ourversion $fakeroot /; $msg $progname $ourversion $fakeroot
$name $type $mode $link $uid $gid $major $minor $start $step $count /;
@list =(); @list =();
@seq = (); @seq = ();
@ -91,31 +92,46 @@ foreach $line (@list) {
next if ($line =~ /^#/); next if ($line =~ /^#/);
next if ($line =~ /^$/); next if ($line =~ /^$/);
@cmd = split (/\t/, $line); @cmd = split (/\t/, $line);
next if (not defined $cmd[1]);
next if (scalar @cmd != 10); next if (scalar @cmd != 10);
if ($cmd[1] eq "s") { # 0 1 2 3 4 5 6 7 8 9
push @seq, "ln -s $cmd[0] .$cmd[2]"; ($name, $type, $mode, $uid, $gid, $major, $minor, $start, $step, $count) = split (/\t/, $line);
next if (not defined $type or not defined $count);
if ($type eq "s") {
$link = $mode;
push @seq, "ln -s $name .$link";
next; next;
} }
if ($cmd[1] eq "h") { if ($type eq "h") {
push @seq, "ln $cmd[0] .$cmd[2]"; $link = $mode;
push @seq, "ln $name .$link";
next; next;
} }
if ($cmd[1] eq "d"){ if ($type eq "d"){
push @seq, "mkdir -m $cmd[2] -p .$cmd[0]"; push @seq, "mkdir -m $mode -p .$name";
next; next;
} }
if ($cmd[9] =~ /-/) { if ($count =~ /-/) {
push @seq, "mknod .$cmd[0] $cmd[1] $cmd[5] $cmd[6]"; push @seq, "mknod .$name $type $major $minor";
push @seq, "chmod $cmd[2] .$cmd[0]"; push @seq, "chmod $mode .$name";
push @seq, "chown $cmd[3]:$cmd[4] .$cmd[0]"; push @seq, "chown $uid:$gid .$name";
} else { } else {
for ($i = 0; $i < $cmd[9]; $i += $cmd[8]) { for ($i = $start; $i < $count; $i += $step) {
push @seq, "mknod .$cmd[0]$i $cmd[1] $cmd[5] $cmd[6]"; my $inc = $minor + $i;
push @seq, "chmod $cmd[2] .$cmd[0]$i"; push @seq, "mknod .$name$i $type $major $inc";
push @seq, "chown $cmd[3]:$cmd[4] .$cmd[0]$i"; push @seq, "chmod $mode .$name$i";
push @seq, "chown $uid:$gid .$name$i";
} }
} }
undef $name;
undef $type;
undef $mode;
undef $uid;
undef $gid;
undef $major;
undef $minor;
undef $start;
undef $step;
undef $count;
} }
if (defined $dry) { if (defined $dry) {
print join ("\n", @seq); print join ("\n", @seq);