Skip to content

Take over /usr/bin/pivot too #885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 25, 2019
Merged

Take over /usr/bin/pivot too #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/machine-config-daemon/pivot.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/usr/bin/sh
exec /usr/libexec/machine-config-daemon pivot "$@"
2 changes: 2 additions & 0 deletions machine-config-daemon.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ env VERSION_OVERRIDE=%{version} SOURCE_GIT_COMMIT=%{commit} make daemon

%install
install -D -m 0755 _output/linux/*/%{name} $RPM_BUILD_ROOT/usr/libexec/%{name}
install -D -m 0755 cmd/machine-config-daemon/pivot.sh $RPM_BUILD_ROOT/%{_bindir}/pivot

%files
%license LICENSE
%doc README.md
%{_libexecdir}/%{name}
%{_bindir}/pivot
Copy link
Member

@runcom runcom Jun 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

isn't this conflicting with https://github.com/openshift/machine-config-operator/blob/master/pkg/daemon/rpm-ostree.go#L132

Copy link
Member

@runcom runcom Jun 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uhm, this slipped through, @cgwalters can you take a super fast look?

Copy link
Member Author

@cgwalters cgwalters Jun 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're totally right but because we aren't auto-building the RPM yet we have time to do a PR to drop the compat code which I think we can do now that a RHCOS bootimage update landed.

Copy link
Member Author

@cgwalters cgwalters Jun 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#891