Do not write timezone when there is no value

yast · Aug 3, 2021 · 413256a · 413256a
1 parent 204bc3e
commit 413256a
Showing 1 changed file with 35 additions and 21 deletions.
diff --git a/timezone/src/modules/Timezone.rb b/timezone/src/modules/Timezone.rb
@@ -837,27 +837,7 @@ def Save
         return
       end
 
-      cmd = if Stage.initial
-        # do use --root option, running in chroot does not work
-        "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --timezone '#{@timezone}'"
-      else
-        # this sets both the locale (see "man localectl")
-        "/usr/bin/timedatectl set-timezone #{@timezone}"
-      end
-      log.info "Making timezone setting persistent: #{cmd}"
-      result = if Stage.initial
-        WFM.Execute(path(".local.bash_output"), cmd)
-      else
-        SCR.Execute(path(".target.bash_output"), cmd)
-      end
-      if result["exit"] != 0
-        log.error "Timezone configuration not written. Failed to execute '#{cmd}'"
-        log.error "output: #{result.inspect}"
-        # TRANSLATORS: the "%s" is replaced by the executed command
-        Report.Error(_("Could not save the timezone setting, the command\n%s\nfailed.") % cmd)
-      else
-        log.info "output: #{result.inspect}"
-      end
+      write_timezone
 
       SCR.Write(path(".sysconfig.clock.DEFAULT_TIMEZONE"), @default_timezone)
 
@@ -1125,6 +1105,40 @@ def windows_architecture?
     def disk_analyzer
       Y2Storage::StorageManager.instance.probed_disk_analyzer
     end
+
+    # Writes the timezone configuration
+    def write_timezone
+      if @timezone.nil? || @timezone.strip.empty?
+        log.warn("Timezone configuration not written. No value was given.")
+        return
+      end
+
+      cmd = if Stage.initial
+        # do use --root option, running in chroot does not work
+        "/usr/bin/systemd-firstboot --root '#{Installation.destdir}' --timezone '#{@timezone}'"
+      else
+        # this sets both the locale (see "man localectl")
+        "/usr/bin/timedatectl set-timezone #{@timezone}"
+      end
+
+      log.info "Making timezone setting persistent: #{cmd}"
+
+      result = if Stage.initial
+        WFM.Execute(path(".local.bash_output"), cmd)
+      else
+        SCR.Execute(path(".target.bash_output"), cmd)
+      end
+
+      if result["exit"] != 0
+        log.error "Timezone configuration not written. Failed to execute '#{cmd}'"
+        log.error "output: #{result.inspect}"
+
+        # TRANSLATORS: the "%s" is replaced by the executed command
+        Report.Error(_("Could not save the timezone setting, the command\n%s\nfailed.") % cmd)
+      else
+        log.info "output: #{result.inspect}"
+      end
+    end
   end
 
   Timezone = TimezoneClass.new