mirror of
https://github.com/systemd/systemd.git
synced 2025-01-26 14:04:03 +03:00
[PATCH] add test and documentation for new %D devfs format modifier
This commit is contained in:
parent
5c6f0f141d
commit
36043f8418
@ -25,7 +25,7 @@ my $PWD = $ENV{PWD};
|
||||
my $sysfs = "sys/";
|
||||
my $udev_bin = "../udev";
|
||||
my $udev_root = "udev-root/"; # !!! directory will be removed !!!
|
||||
my $udev_db = "udev.tdb";
|
||||
my $udev_db = ".udev.tdb";
|
||||
my $perm = "udev.permissions";
|
||||
my $conf_tmp = "udev-test.config";
|
||||
|
||||
@ -106,6 +106,24 @@ EOF
|
||||
expected => "test-0:0:0:0" ,
|
||||
conf => <<EOF
|
||||
CALLOUT, BUS="scsi", PROGRAM="/bin/echo -n test-%b", ID="test-*", NAME="%c"
|
||||
EOF
|
||||
},
|
||||
{
|
||||
desc => "devfs disk naming substitution",
|
||||
subsys => "block",
|
||||
devpath => "block/sda",
|
||||
expected => "lun0/disk" ,
|
||||
conf => <<EOF
|
||||
LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
|
||||
EOF
|
||||
},
|
||||
{
|
||||
desc => "devfs disk naming substitution",
|
||||
subsys => "block",
|
||||
devpath => "block/sda/sda2",
|
||||
expected => "lun0/part2" ,
|
||||
conf => <<EOF
|
||||
LABEL, BUS="scsi", vendor="IBM-ESXS", NAME="lun0/%D"
|
||||
EOF
|
||||
},
|
||||
);
|
||||
@ -173,7 +191,7 @@ foreach my $config (@tests) {
|
||||
print "$error errors occured\n\n";
|
||||
|
||||
# cleanup
|
||||
unlink($udev_db);
|
||||
system("rm -rf $udev_root");
|
||||
unlink($conf_tmp);
|
||||
unlink($udev_db);
|
||||
|
||||
|
5
udev.8
5
udev.8
@ -106,6 +106,11 @@ the bus id for the device
|
||||
.B %c
|
||||
the CALLOUT program returned string
|
||||
(this does not work within the PROGRAM field for the obvious reason.)
|
||||
.TP
|
||||
.B %D
|
||||
Use the devfs style disk name for this device.
|
||||
For partitions, this will result in 'part%n'
|
||||
If this is not a partition, it will result in 'disk'
|
||||
.RE
|
||||
.P
|
||||
A sample \fIudev.conf\fP might look like this:
|
||||
|
@ -7,6 +7,9 @@
|
||||
# %b - the bus id for the device
|
||||
# %c - the return value for the CALLOUT program (note, this doesn't work within
|
||||
# the PROGRAM field for the obvious reason.)
|
||||
# %D - use the devfs style disk name for this device.
|
||||
# For partitions, this will result in 'part%n'
|
||||
# If this is not a partition, it will result in 'disk'
|
||||
#
|
||||
|
||||
# Looking for scsi bus id 42:0:0:1
|
||||
|
Loading…
x
Reference in New Issue
Block a user