#2339 kojira: drop kojira.sysconfig
Merged 3 years ago by tkopecek. Opened 3 years ago by tkopecek.
tkopecek/koji issue2171  into  master

@@ -1277,7 +1277,6 @@ 

  -------------------

  

  * ``/etc/kojira/kojira.conf`` - Kojira Daemon Configuration

- * ``/etc/sysconfig/kojira`` - Kojira Daemon Switches

  

  Install kojira

  ---------------

file modified
-3
@@ -538,9 +538,6 @@ 

  %{_unitdir}/koji-gc.service

  %{_unitdir}/koji-gc.timer

  %{_unitdir}/kojira.service

- %else

- %{_initrddir}/kojira

%{_initrddir}/kojira is still installled by Makefile. Better to add a systemd check condition?

- %config(noreplace) /etc/sysconfig/kojira

  %endif

  %dir /etc/kojira

  %config(noreplace) /etc/kojira/kojira.conf

file modified
+2 -5
@@ -38,10 +38,7 @@ 

  	install -p -m 644 koji-sweep-db.timer $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR)

  

  install-sysv: _install

- 	mkdir -p $(DESTDIR)/etc/rc.d/init.d

- 	install -p -m 755 kojira.init $(DESTDIR)/etc/rc.d/init.d/kojira

- 

- 	mkdir -p $(DESTDIR)/etc/sysconfig

- 	install -p -m 644 kojira.sysconfig $(DESTDIR)/etc/sysconfig/kojira

+ 	# no more utils support for sysv

+ 	true

  

  install: install-$(TYPE)

file modified
-2
@@ -14,8 +14,6 @@ 

  # Check that we're a privileged user

  [ `id -u` = 0 ] || exit 0

  

- [ -f /etc/sysconfig/kojira ] && . /etc/sysconfig/kojira

- 

  prog="kojira"

  

  # Check that networking is up.

file removed
-4
@@ -1,4 +0,0 @@ 

- FORCE_LOCK=Y

- KOJIRA_DEBUG=N

- KOJIRA_VERBOSE=Y

- RUNAS=root

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

3 years ago

%{_initrddir}/kojira is still installled by Makefile. Better to add a systemd check condition?

Metadata Update from @julian8628:
- Pull-request untagged with: testing-ready

3 years ago

temporarily removing testing-ready tag for the sanity of QE's build

rebased onto a75b1c2

3 years ago

@julian8628 We're dropping utils for sysv anyway, so I've removed sysv part of Makefile

Metadata Update from @tkopecek:
- Pull-request tagged with: testing-ready

3 years ago

Commit 54dbe5a fixes this pull-request

Pull-Request has been merged by tkopecek

3 years ago

Metadata Update from @jcupova:
- Pull-request tagged with: testing-done

3 years ago