X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbootchart%2Fsvg.c;h=dc55cb3797a7fdf8813dc7fdb7a223e0a251a765;hb=b823b5e272d07d31c12625a268e8d563289a4db5;hp=8da32efca5c5e3a66057ec600d412947c9198ca8;hpb=8d6167101696a28b7ac61b48fd2c1920564c4e90;p=elogind.git

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index 8da32efca..dc55cb379 100644
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -28,6 +28,8 @@
 #include <limits.h>
 #include <unistd.h>
 #include <sys/utsname.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 
 #include "bootchart.h"
 #include "util.h"
@@ -95,10 +97,10 @@ static void svg_header(void)
 
         /* write some basic info as a comment, including some help */
         svg("<!-- This file is a bootchart SVG file. It is best rendered in a browser -->\n");
-        svg("<!-- such as Chrome/Chromium, firefox. Other applications that render    -->\n");
-        svg("<!-- these files properly but much more slow are ImageMagick, gimp,      -->\n");
-        svg("<!-- inkscape, etc.. To display the files on your system, just point     -->\n");
-        svg("<!-- your browser to file:///var/log/ and click. This bootchart was      -->\n\n");
+        svg("<!-- such as Chrome, Chromium, or Firefox. Other applications that       -->\n");
+        svg("<!-- render these files properly but more slowly are ImageMagick, gimp,  -->\n");
+        svg("<!-- inkscape, etc. To display the files on your system, just point      -->\n");
+        svg("<!-- your browser to file:///run/log/ and click. This bootchart was      -->\n\n");
 
         svg("<!-- generated by bootchart version %s, running with options:  -->\n", VERSION);
         svg("<!-- hz=\"%f\" n=\"%d\" -->\n", hz, len);
@@ -151,10 +153,12 @@ static void svg_title(void)
         char *c;
         FILE *f;
         time_t t;
+        int fd;
         struct utsname uts;
 
         /* grab /proc/cmdline */
-        f = fopen("/proc/cmdline", "r");
+        fd = openat(procfd, "cmdline", O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 if (!fgets(cmdline, 255, f))
                         sprintf(cmdline, "Unknown");
@@ -167,8 +171,9 @@ static void svg_title(void)
                 strncpy(rootbdev, &c[10], 3);
                 rootbdev[3] = '\0';
         }
-        sprintf(filename, "/sys/block/%s/device/model", rootbdev);
-        f = fopen(filename, "r");
+        sprintf(filename, "block/%s/device/model", rootbdev);
+        fd = openat(sysfd, filename, O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 if (!fgets(model, 255, f))
                         fprintf(stderr, "Error reading disk model for %s\n", rootbdev);
@@ -184,7 +189,8 @@ static void svg_title(void)
         strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", localtime(&t));
 
         /* CPU type */
-        f = fopen("/proc/cpuinfo", "r");
+        fd = openat(procfd, "cpuinfo", O_RDONLY);
+        f = fdopen(fd, "r");
         if (f) {
                 while (fgets(buf, 255, f)) {
                         if (strstr(buf, "model name")) {