Skip to content

Fix of selinux directories#600

Merged
mangelajo merged 2 commits intoopenshift:mainfrom
cooktheryan:selinux-rpm-bug
Feb 9, 2022
Merged

Fix of selinux directories#600
mangelajo merged 2 commits intoopenshift:mainfrom
cooktheryan:selinux-rpm-bug

Conversation

@cooktheryan
Copy link
Copy Markdown
Contributor

@cooktheryan cooktheryan commented Feb 7, 2022

Modify the way we are creating and labeling directories

Closes #598

@cooktheryan
fix of selinux directories
7634983 
Signed-off-by: Ryan Cook <rcook@redhat.com>
@openshift-ci openshift-ci Bot requested review from copejon and sallyom February 7, 2022 16:22
@cooktheryan
Copy link
Copy Markdown
Contributor Author

cooktheryan commented Feb 7, 2022 

[root@ip-172-31-87-50 ~]# dnf install microshift
Updating Subscription Management repositories.
Copr repo for microshift owned by cooktheryan                                         38 kB/s | 2.6 kB     00:00    
Dependencies resolved.
=====================================================================================================================
 Package  Arch   Version                                 Repository                                             Size
=====================================================================================================================
Installing:
 microshift
          x86_64 4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8 copr:copr.fedorainfracloud.org:cooktheryan:microshift  36 M
Installing dependencies:
 microshift-selinux
          noarch 4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8 copr:copr.fedorainfracloud.org:cooktheryan:microshift  20 k

Transaction Summary
=====================================================================================================================
Install  2 Packages

Total download size: 36 M
Installed size: 154 M
Is this ok [y/N]: y
Downloading Packages:
(1/2): microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch.rpm         334 kB/s |  20 kB     00:00    
(2/2): microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64.rpm                  19 MB/s |  36 MB     00:01    
---------------------------------------------------------------------------------------------------------------------
Total                                                                                 19 MB/s |  36 MB     00:01     
Copr repo for microshift owned by cooktheryan                                         49 kB/s | 1.0 kB     00:00    
Importing GPG key 0x26DF568C:
 Userid     : "cooktheryan_microshift (None) <cooktheryan#microshift@copr.fedorahosted.org>"
 Fingerprint: 6075 9B78 E731 4E58 7E4F E878 AA94 B3E7 26DF 568C
 From       : https://download.copr.fedorainfracloud.org/results/cooktheryan/microshift/pubkey.gpg
Is this ok [y/N]: y
Key imported successfully
Running transaction check
Transaction check succeeded.
Running transaction test
Transaction test succeeded.
Running transaction
  Preparing        :                                                                                             1/1 
  Installing       : microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch                           1/2 
  Running scriptlet: microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch                           1/2 
  Installing       : microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64                                   2/2 
  Running scriptlet: microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64                                   2/2 
  Running scriptlet: microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch                           2/2 
  Running scriptlet: microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64                                   2/2 
  Verifying        : microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64                                   1/2 
  Verifying        : microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch                           2/2 
Installed products updated.

Installed:
  microshift-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.x86_64                                                          
  microshift-selinux-4.8.0-2022_02_02_194009_3_gc5c2c9d6.el8.noarch                                                  

Complete!

[root@ip-172-31-87-50 ~]# ls -lZ /var/
drwxr-xr-x.  2 root root unconfined_u:object_r:container_file_t:s0    6 Feb  7 16:10 hpvolumes

mangelajo
mangelajo reviewed Feb 7, 2022
View reviewed changes
Comment thread packaging/rpm/microshift.spec Outdated
@cooktheryan cooktheryan changed the title fix of selinux directories WIP: fix of selinux directories Feb 7, 2022
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 7, 2022
@cooktheryan
include selinux labeling only if enabled
e286ca3 
Signed-off-by: Ryan Cook <rcook@redhat.com>
@cooktheryan cooktheryan requested a review from mangelajo February 7, 2022 17:06
@cooktheryan
Copy link
Copy Markdown
Contributor Author

cooktheryan commented Feb 7, 2022

@mangelajo sorry about that. Patched.

[ec2-user@ip-172-31-91-72 ~]$ sudo dnf -y install microshift
Updating Subscription Management repositories.
Copr repo for microshift owned by cooktheryan                                         50 kB/s | 2.6 kB     00:00    
Dependencies resolved.
=====================================================================================================================
 Package  Arch   Version                                 Repository                                             Size
=====================================================================================================================
Installing:
 microshift
          x86_64 4.8.0-2022_02_02_194009_4_g76349837.el8 copr:copr.fedorainfracloud.org:cooktheryan:microshift  36 M
Installing dependencies:
 microshift-selinux
          noarch 4.8.0-2022_02_02_194009_4_g76349837.el8 copr:copr.fedorainfracloud.org:cooktheryan:microshift  20 k

Transaction Summary
=====================================================================================================================
Install  2 Packages

Total download size: 36 M
Installed size: 154 M
Downloading Packages:
(1/2): microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch.rpm         662 kB/s |  20 kB     00:00    
(2/2): microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64.rpm                  22 MB/s |  36 MB     00:01    
---------------------------------------------------------------------------------------------------------------------
Total                                                                                 22 MB/s |  36 MB     00:01     
Copr repo for microshift owned by cooktheryan                                         44 kB/s | 1.0 kB     00:00    
Importing GPG key 0x26DF568C:
 Userid     : "cooktheryan_microshift (None) <cooktheryan#microshift@copr.fedorahosted.org>"
 Fingerprint: 6075 9B78 E731 4E58 7E4F E878 AA94 B3E7 26DF 568C
 From       : https://download.copr.fedorainfracloud.org/results/cooktheryan/microshift/pubkey.gpg
Key imported successfully
Running transaction check
Transaction check succeeded.
Running transaction test
Transaction test succeeded.
Running transaction
  Preparing        :                                                                                             1/1 
  Installing       : microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch                           1/2 
  Running scriptlet: microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch                           1/2 
  Installing       : microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64                                   2/2 
  Running scriptlet: microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64                                   2/2 
  Running scriptlet: microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch                           2/2 
  Running scriptlet: microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64                                   2/2 
  Verifying        : microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64                                   1/2 
  Verifying        : microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch                           2/2 
Installed products updated.

Installed:
  microshift-4.8.0-2022_02_02_194009_4_g76349837.el8.x86_64                                                          
  microshift-selinux-4.8.0-2022_02_02_194009_4_g76349837.el8.noarch                                                  

Complete!
[ec2-user@ip-172-31-91-72 ~]$ ls -lZ /var/
total 8
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 adm
drwxr-xr-x. 10 root root system_u:object_r:var_t:s0                 117 Feb  7 16:53 cache
drwxr-xr-x.  2 root root system_u:object_r:kdump_crash_t:s0           6 Nov  2 07:50 crash
drwxr-xr-x.  3 root root system_u:object_r:system_db_t:s0            18 Jun 21  2021 db
drwxr-xr-x.  3 root root system_u:object_r:var_t:s0                  18 Jun 21  2021 empty
drwxr-xr-x.  2 root root system_u:object_r:public_content_t:s0        6 Jun 21  2021 ftp
drwxr-xr-x.  2 root root system_u:object_r:games_data_t:s0            6 Jun 21  2021 games
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 gopher
drwxr-xr-x.  2 root root unconfined_u:object_r:container_file_t:s0    6 Feb  7 17:05 hpvolumes
drwxr-xr-x.  3 root root system_u:object_r:var_t:s0                  18 Aug 25 15:20 kerberos
drwxr-xr-x. 34 root root system_u:object_r:var_lib_t:s0            4096 Feb  7 17:04 lib
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 local
lrwxrwxrwx.  1 root root system_u:object_r:var_lock_t:s0             11 May  4  2021 lock -> ../run/lock
drwxr-xr-x. 11 root root system_u:object_r:var_log_t:s0            4096 Feb  7 17:03 log
lrwxrwxrwx.  1 root root system_u:object_r:mail_spool_t:s0           10 Jun 21  2021 mail -> spool/mail
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 nis
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 opt
drwxr-xr-x.  2 root root system_u:object_r:var_t:s0                   6 Jun 21  2021 preserve
lrwxrwxrwx.  1 root root system_u:object_r:var_run_t:s0               6 May  4  2021 run -> ../run
drwxr-xr-x.  7 root root system_u:object_r:var_spool_t:s0            68 Jun 21  2021 spool
drwxrwxrwt.  4 root root system_u:object_r:tmp_t:s0                 103 Feb  7 17:05 tmp
drwxr-xr-x.  2 root root system_u:object_r:var_yp_t:s0                6 Jun 21  2021 yp
[ec2-user@ip-172-31-91-72 ~]$

@cooktheryan cooktheryan changed the title WIP: fix of selinux directories Fix of selinux directories Feb 7, 2022
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 7, 2022
@cooktheryan
Copy link
Copy Markdown
Contributor Author

cooktheryan commented Feb 7, 2022

/test e2e-openshift-conformance-sig-arch

@mangelajo
Copy link
Copy Markdown
Contributor

mangelajo commented Feb 8, 2022

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 8, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Feb 8, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mangelajo

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 8, 2022
@mangelajo mangelajo merged commit 077be17 into openshift:main Feb 9, 2022
@mangelajo mangelajo mentioned this pull request Mar 4, 2022
Open
@mangelajo mangelajo mentioned this pull request Apr 12, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@copejon copejon Awaiting requested review from copejon

@sallyom sallyom Awaiting requested review from sallyom

@mangelajo mangelajo Awaiting requested review from mangelajo

Assignees

@mangelajo mangelajo

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG] line 16: fg: no job control when installing RPM on Fedora 35

2 participants

@cooktheryan @mangelajo