89 lines
2.7 KiB
Diff
89 lines
2.7 KiB
Diff
From 7b6d91fb78be31c9a95b10ad01765eb627784119 Mon Sep 17 00:00:00 2001
|
|
From: Boris Ranto <branto@redhat.com>
|
|
Date: Tue, 27 Nov 2018 00:30:26 +0100
|
|
Subject: [PATCH 1/4] f30 python3 execs
|
|
|
|
---
|
|
src/ceph-create-keys | 2 +-
|
|
src/ceph-detect-init/ceph_detect_init/main.py | 2 +-
|
|
src/ceph-disk/ceph_disk/main.py | 2 +-
|
|
src/ceph-volume/bin/ceph-volume | 2 +-
|
|
src/ceph-volume/bin/ceph-volume-systemd | 2 +-
|
|
src/ceph.in | 2 +-
|
|
src/mount.fuse.ceph | 2 +-
|
|
7 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/ceph-create-keys b/src/ceph-create-keys
|
|
index c14c02f28d..7e80aab6a2 100755
|
|
--- a/src/ceph-create-keys
|
|
+++ b/src/ceph-create-keys
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
import argparse
|
|
import errno
|
|
import json
|
|
diff --git a/src/ceph-detect-init/ceph_detect_init/main.py b/src/ceph-detect-init/ceph_detect_init/main.py
|
|
index 320ae17032..c18ce74c1c 100644
|
|
--- a/src/ceph-detect-init/ceph_detect_init/main.py
|
|
+++ b/src/ceph-detect-init/ceph_detect_init/main.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
#
|
|
# Copyright (C) 2015 <contact@redhat.com>
|
|
# Copyright (C) 2015 SUSE LINUX GmbH
|
|
diff --git a/src/ceph-disk/ceph_disk/main.py b/src/ceph-disk/ceph_disk/main.py
|
|
index 639c49e7e1..bfcce98351 100644
|
|
--- a/src/ceph-disk/ceph_disk/main.py
|
|
+++ b/src/ceph-disk/ceph_disk/main.py
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
#
|
|
# Copyright (C) 2015, 2016, 2017 Red Hat <contact@redhat.com>
|
|
# Copyright (C) 2014 Inktank <info@inktank.com>
|
|
diff --git a/src/ceph-volume/bin/ceph-volume b/src/ceph-volume/bin/ceph-volume
|
|
index 5905cfccc0..a4f62b4a1f 100755
|
|
--- a/src/ceph-volume/bin/ceph-volume
|
|
+++ b/src/ceph-volume/bin/ceph-volume
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
|
|
from ceph_volume import main
|
|
|
|
diff --git a/src/ceph-volume/bin/ceph-volume-systemd b/src/ceph-volume/bin/ceph-volume-systemd
|
|
index 7da8ec6b1c..f6c751cf44 100755
|
|
--- a/src/ceph-volume/bin/ceph-volume-systemd
|
|
+++ b/src/ceph-volume/bin/ceph-volume-systemd
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
|
|
from ceph_volume.systemd import main
|
|
|
|
diff --git a/src/ceph.in b/src/ceph.in
|
|
index c37ce6d846..c54f9a7006 100755
|
|
--- a/src/ceph.in
|
|
+++ b/src/ceph.in
|
|
@@ -1,4 +1,4 @@
|
|
-#!@PYTHON_EXECUTABLE@
|
|
+#!@PYTHON3_EXECUTABLE@
|
|
# -*- mode:python -*-
|
|
# vim: ts=4 sw=4 smarttab expandtab
|
|
#
|
|
diff --git a/src/mount.fuse.ceph b/src/mount.fuse.ceph
|
|
index 87349a0ab0..c61625a8c2 100755
|
|
--- a/src/mount.fuse.ceph
|
|
+++ b/src/mount.fuse.ceph
|
|
@@ -1,4 +1,4 @@
|
|
-#!/usr/bin/env python
|
|
+#!/usr/bin/python3
|
|
'''
|
|
Helper to mount ceph-fuse from /etc/fstab. To use, add an entry
|
|
like:
|
|
--
|
|
2.19.1
|
|
|