Made "desktop-printing" package being installed automatically when
CUPS is used with a local daemon.
1 files changed, 3 insertions, 2 deletions
@@ -123,13 +123,14 @@ our %spoolers = ('pdq' => { 'boot_spooler' => 'cups', 'service' => 'cups', 'local_queues' => 1, - 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups', + 'packages2add' => [ ['cups', 'net-tools', 'xpp', 'cups-drivers', 'gutenprint-cups', 'desktop-printing', $::isInstall ? 'curl' : 'webfetch'], [ qw(/usr/lib/cups/cgi-bin/printers.cgi /sbin/ifconfig /usr/bin/xpp /usr/lib/cups/filter/rastertolxx74 - /usr/lib/cups/filter/commandtoepson), + /usr/lib/cups/filter/commandtoepson + /usr/bin/eggcups), $::isInstall || !(-x '/usr/bin/wget') ? '/usr/bin/curl' : |
7'>187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
package devices; # $Id$
use diagnostics;
use strict;
use common;
use run_program;
use log;
use c;
sub del_loop {
my ($dev) = @_;
run_program::run("losetup", "-d", $dev);
}
sub find_free_loop() {
foreach (0..255) {
my $dev = make("loop$_");
sysopen(my $F, $dev, 2) or next;
!ioctl($F, c::LOOP_GET_STATUS(), my $_tmp) && $! == 6 or next; #- 6 == ENXIO
return $dev;
}
die "no free loop found";
}
sub set_loop {
my ($file, $o_encrypt_key, $o_encryption) = @_;
require modules;
eval { modules::load('loop') };
my $dev = find_free_loop();
if ($o_encrypt_key && $o_encryption) {
eval { modules::load('cryptoloop', 'cbc', arch() =~ /i.86/ ? 'aes-i586' : 'aes') };
my $cmd = "losetup -p 0 -e $o_encryption $dev $file";
log::l("calling $cmd");
open(my $F, "|$cmd");
print $F $o_encrypt_key;
close $F or die "losetup failed";
} else {
run_program::run("losetup", $dev, $file)
|| run_program::run("losetup", "-r", $dev, $file) or return;
}
$dev;
}
sub find_compressed_image {
my ($name) = @_;
foreach (0..255) {
my $dev = make("loop$_");
my ($file) = `losetup $dev 2>/dev/null` =~ m!\((.*?)\)! or return;
$file =~ s!^/sysroot/!/!;
basename($file) eq $name and return $dev, $file;
}
undef;
}
sub get_dynamic_major {
my ($name) = @_;
cat_('/proc/devices') =~ /^(\d+) \Q$name\E$/m && $1;
}
sub init_device_mapper() {
require modules;
eval { modules::load('dm-mod') };
make('urandom');
my $control = '/dev/mapper/control';
if (! -e $control) {
my ($major) = get_dynamic_major('misc') or return;
my ($minor) = cat_('/proc/misc') =~ /(\d+) device-mapper$/m or return;
mkdir_p(dirname($control));
syscall_('mknod', $control, c::S_IFCHR() | 0600, makedev($major, $minor)) or die "mknod $control failed: $!";
}
}
sub entry {
my ($type, $major, $minor);
local ($_) = @_;
if (/^0x([\da-f]{3,4})$/i) {
$type = c::S_IFBLK();
($major, $minor) = unmakedev(hex $1);
} elsif (/^(sd.)(\d{0,2})/) {
my $path = $2 ? "/sys/block/$1/$1$2/dev" : "/sys/block/$1/dev";
($major, $minor) = split(':', chomp_(cat_($path)));
$type = c::S_IFBLK();
} elsif (/^hd(.)(\d{0,2})/) {
$type = c::S_IFBLK();
($major, $minor) =
@{ ${{'a' => [3, 0], 'b' => [3, 64],
'c' => [22,0], 'd' => [22,64],
'e' => [33,0], 'f' => [33,64],
'g' => [34,0], 'h' => [34,64],
'i' => [56,0], 'j' => [56,64],
'k' => [57,0], 'l' => [57,64],
'm' => [88,0], 'n' => [88,64],
'o' => [89,0], 'p' => [89,64],
'q' => [90,0], 'r' => [90,64],
's' => [91,0], 't' => [91,64],
}}{$1} or internal_error("unknown device $_") };
$minor += $2 || 0;
} elsif (/^ram(.*)/) {
$type = c::S_IFBLK();
$major = 1;
$minor = $1 eq '' ? 1 : $1;
} elsif (m|^rd/c(\d+)d(\d+)(p(\d+))?|) {
# dac 960 "rd/cXdXXpX"
$type = c::S_IFBLK();
$major = 48 + $1;
$minor = 8 * $2 + $4;
} elsif (m,(ida|cciss)/c(\d+)d(\d+)(?:p(\d+))?,) {
# Compaq Smart Array "ida/c0d0{p1}"
$type = c::S_IFBLK();
$major = ($1 eq 'ida' ? 72 : 104) + $2;
$minor = 16 * $3 + ($4 || 0);
} elsif (m,(ataraid)/d(\d+)(?:p(\d+))?,) {
# ATA raid "ataraid/d0{p1}"
$type = c::S_IFBLK();
$major = 114;
$minor = 16 * $1 + ($2 || 0);
} elsif (my ($prefix, $nb) = /(.*?)(\d+)$/) {
my $f = ${{"fd" => sub { c::S_IFBLK(), 2, 0 },
"hidbp-mse-" => sub { c::S_IFCHR(), 10, 32 },
"lp" => sub { c::S_IFCHR(), 6, 0 },
"usb/lp" => sub { c::S_IFCHR(), 180, 0 },
"input/event" => sub { c::S_IFCHR(), 13, 64 },
"loop" => sub { c::S_IFBLK(), 7, 0 },
"md" => sub { c::S_IFBLK(), 9, 0 },
"nst" => sub { c::S_IFCHR(), 9, 128 },
"sr" => sub { c::S_IFBLK(), 11, 0 },
"tty" => sub { c::S_IFCHR(), 4, 0 },
"ttyS" => sub { c::S_IFCHR(), 4, 64 },
"ubd/" => sub { c::S_IFBLK(), 98, 0 },
"dm-" => sub { c::S_IFBLK(), get_dynamic_major('device-mapper'), 0 },
}}{$prefix} or internal_error("unknown device $prefix $nb");
($type, $major, $minor) = $f->();
$minor += $nb;
}
unless ($type) {
($type, $major, $minor) =
@{ ${{"aztcd" => [ c::S_IFBLK(), 29, 0 ],
"bpcd" => [ c::S_IFBLK(), 41, 0 ],
"cdu31a" => [ c::S_IFBLK(), 15, 0 ],
"cdu535" => [ c::S_IFBLK(), 24, 0 ],
"cm206cd" => [ c::S_IFBLK(), 32, 0 ],
"gscd" => [ c::S_IFBLK(), 16, 0 ],
"mcd" => [ c::S_IFBLK(), 23, 0 ],
"mcdx" => [ c::S_IFBLK(), 20, 0 ],
"mem" => [ c::S_IFCHR(), 1, 1 ],
"optcd" => [ c::S_IFBLK(), 17, 0 ],
"kbd" => [ c::S_IFCHR(), 11, 0 ],
"psaux" => [ c::S_IFCHR(), 10, 1 ],
"atibm" => [ c::S_IFCHR(), 10, 3 ],
"random" => [ c::S_IFCHR(), 1, 8 ],
"urandom" => [ c::S_IFCHR(), 1, 9 ],
"sbpcd" => [ c::S_IFBLK(), 25, 0 ],
"sjcd" => [ c::S_IFBLK(), 18, 0 ],
"tty" => [ c::S_IFCHR(), 5, 0 ],
"input/mice"
=> [ c::S_IFCHR(), 13, 63 ],
"adbmouse" => [ c::S_IFCHR(), 10, 10 ], #- PPC
"vcsa" => [ c::S_IFCHR(), 7, 128 ],
"zero" => [ c::S_IFCHR(), 1, 5 ],
"null" => [ c::S_IFCHR(), 1, 3 ],
"initrd" => [ c::S_IFBLK(), 1, 250 ],
"console" => [ c::S_IFCHR(), 5, 1 ],
"systty" => [ c::S_IFCHR(), 4, 0 ],
"lvm" => [ c::S_IFBLK(), 109, 0 ],
}}{$_} or internal_error("unknown device $_") };
}
($type, $major, $minor);
}
sub make($) {
local $_ = my $file = $_[0];
if (m!^(.*/dev)/(.*)!) {
$_ = $2;
} else {
$file =~ m|^/| && -e $file or $file = "/dev/$_";
}
-e $file and return $file; #- assume nobody takes fun at creating files named as device
my ($type, $major, $minor) = entry($_);
#- make a directory for this inode if needed.
mkdir_p(dirname($file));
syscall_('mknod', $file, $type | 0600, makedev($major, $minor)) or do {
die "mknod failed (dev $_): $!" if ! -e $file; # we may have raced with udev
};
$file;
}
sub simple_partition_scan {
my ($part) = @_;
$part->{device} =~ /([hs]d[a-z])(\d+)$/;
}
sub part_number {
my ($part) = @_;
(simple_partition_scan($part))[1];
}
sub part_prefix {
my ($part) = @_;
(simple_partition_scan($part))[0];
}
sub prefix_for_dev {
my ($dev) = @_;
$dev . ($dev =~ /\d$/ || $dev =~ m!mapper/! ? 'p' : '');
}
sub should_prefer_UUID {
my ($dev) = @_;
$dev =~ /^(hd|sd)/;
}
sub symlink_now_and_register {
my ($if_struct, $of) = @_;
my $if = $if_struct->{device};
#- add a specific udev script, we can't do it with a udev rule,
#- eg, ttySL0 is a symlink created by a daemon
output_with_perm("$::prefix/etc/udev/devices.d/$of.nodes", 0644, "L $of $if\n");
symlinkf($if, "$::prefix/dev/$of");
}
1;
