chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: do not allow to change the DEVPATH of a device
[elogind.git]
/
src
/
udev
/
cdrom_id
/
cdrom_id.c
diff --git
a/src/udev/cdrom_id/cdrom_id.c
b/src/udev/cdrom_id/cdrom_id.c
index 74c5165e2a3e1d56d6ada0d5551aa2c38260e94b..1ad045923630aa6b59017986250d4f69850f7cd4 100644
(file)
--- a/
src/udev/cdrom_id/cdrom_id.c
+++ b/
src/udev/cdrom_id/cdrom_id.c
@@
-1,7
+1,7
@@
/*
* cdrom_id - optical drive and media information prober
*
/*
* cdrom_id - optical drive and media information prober
*
- * Copyright (C) 2008-2010 Kay Sievers <kay
.sievers
@vrfy.org>
+ * Copyright (C) 2008-2010 Kay Sievers <kay@vrfy.org>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-17,10
+17,6
@@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
-
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
#include <stdio.h>
#include <stddef.h>
#include <stdlib.h>
@@
-513,6
+509,8
@@
static int cd_profiles_old_mmc(struct udev *udev, int fd)
if (cd_media == 1) {
log_debug("no current profile, but disc is present; assuming CD-ROM\n");
cd_media_cd_rom = 1;
if (cd_media == 1) {
log_debug("no current profile, but disc is present; assuming CD-ROM\n");
cd_media_cd_rom = 1;
+ cd_media_track_count = 1;
+ cd_media_track_count_data = 1;
return 0;
} else {
log_debug("no current profile, assuming no media\n");
return 0;
} else {
log_debug("no current profile, assuming no media\n");
@@
-902,8
+900,8
@@
int main(int argc, char *argv[])
break;
case 'd':
debug = true;
break;
case 'd':
debug = true;
- if (udev_get_log_priority(udev) < LOG_INFO)
-
udev_set_log_priority(udev, LOG_INFO
);
+ log_set_max_level(LOG_DEBUG);
+
udev_set_log_priority(udev, LOG_DEBUG
);
break;
case 'h':
printf("Usage: cdrom_id [options] <device>\n"
break;
case 'h':
printf("Usage: cdrom_id [options] <device>\n"