[gnome-ostree] libqa: Do not inject journal export during bootloader install



commit 2a3443af82d3f25a2ea13c71e98a0e811114c71a
Author: Colin Walters <walters verbum org>
Date:   Wed Jul 10 08:49:08 2013 -0400

    libqa: Do not inject journal export during bootloader install
    
    Otherwise this ends up leftover in the /etc of the target disk, being
    forever a modified config file, among other brokenness.

 src/js/libqa.js |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
---
diff --git a/src/js/libqa.js b/src/js/libqa.js
index 1d7e289..2620a1e 100644
--- a/src/js/libqa.js
+++ b/src/js/libqa.js
@@ -353,10 +353,6 @@ function bootloaderInstall(diskpath, workdir, osname, cancellable) {
     let [gfmnt, mntdir] = newReadWriteMount(diskpath, cancellable);
     let ostreeArg;
     try {
-        let [currentDir, currentEtcDir] = getDeployDirs(mntdir, 'gnome-ostree');
-
-        injectExportJournal(currentDir, currentEtcDir, cancellable);
-
        let [kernelPath, initrdPath] = _findCurrentKernel(mntdir, osname, cancellable)
        ostreeArg = _findCurrentOstreeBootArg(mntdir, cancellable);
 
@@ -368,7 +364,6 @@ function bootloaderInstall(diskpath, workdir, osname, cancellable) {
     }
 
     let consoleOutput = workdir.get_child('bootloader-console.out');
-    let journalOutput = workdir.get_child('bootloader-journal-json.txt');
     
     let kernelArgv = ['console=ttyS0', 'panic=1', 'root=LABEL=gnostree-root', 'rw', ostreeArg,
                      'systemd.journald.forward_to_console=true',
@@ -380,9 +375,6 @@ function bootloaderInstall(diskpath, workdir, osname, cancellable) {
                                    '-serial', 'file:' + consoleOutput.get_path(),
                                    '-chardev', 'socket,id=charmonitor,path=qemu.monitor,server,nowait',
                                    '-mon', 'chardev=charmonitor,id=monitor,mode=control',
-                                   '-device', 'virtio-serial',
-                                   '-chardev', 'file,id=journaljson,path=' + journalOutput.get_path(),
-                                   '-device', 
'virtserialport,chardev=journaljson,name=org.gnome.journaljson',
                                   '-kernel', tmpKernelPath.get_path(),
                                   '-initrd', tmpInitrdPath.get_path(),
                                   '-append', kernelArgv.join(' ')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]